Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 63122 invoked from network); 20 Sep 2010 19:29:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Sep 2010 19:29:11 -0000 Received: (qmail 14723 invoked by uid 500); 20 Sep 2010 19:29:11 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 14656 invoked by uid 500); 20 Sep 2010 19:29:11 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 14644 invoked by uid 99); 20 Sep 2010 19:29:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Sep 2010 19:29:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Sep 2010 19:29:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2DCCB2388A02; Mon, 20 Sep 2010 19:28:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999078 - /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Date: Mon, 20 Sep 2010 19:28:50 -0000 To: derby-commits@db.apache.org From: mamta@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100920192850.2DCCB2388A02@eris.apache.org> Author: mamta Date: Mon Sep 20 19:28:49 2010 New Revision: 999078 URL: http://svn.apache.org/viewvc?rev=999078&view=rev Log: Reverting change 990841 from trunk which had gone for DERBY-3644 (NetworkServerControl.ping() on trunk against 10.3.2.1 and older servers give 'DRDA_InvalidReplyHeader2.S:Invalid reply header from network server: Invalid string . Plaintext connection attempt to an SSL enabled server?'). The change is incomplete and will cause problems if it ever got backported by itself. I will checkin a complete fix soon which will address DERBY-3644 and DERBY-4786 Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=999078&r1=999077&r2=999078&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Mon Sep 20 19:28:49 2010 @@ -131,7 +131,8 @@ public final class NetworkServerControlI // command protocol version - you need to increase this number each time // the command protocol changes - private final static int PROTOCOL_VERSION = 1; + // DERBY-2109: shutdown command now transmits user credentials + private final static int PROTOCOL_VERSION = 2; private final static String COMMAND_HEADER = "CMD:"; private final static String REPLY_HEADER = "RPY:"; private final static int REPLY_HEADER_LENGTH = REPLY_HEADER.length();