svn commit: r1089269 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/ftp/FTPSClient.java

[se...@apache.org]

Author: sebb
Date: Tue Apr  5 22:15:51 2011
New Revision: 1089269

URL: http://svn.apache.org/viewvc?rev=1089269&view=rev
Log:
NET-400 Option to override SSL negotiation. Make FTPSClient#execAuth() and FTPSClient#sslNegotiation() protected

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1089269&r1=1089268&r2=1089269&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Apr  5 22:15:51 2011
@@ -67,6 +67,9 @@ This release is binary-compatible with 2
   - ftp.FTPSClient ctors no longer throw NoSuchAlgorithmException
   All users are recommended to upgrade.
 ">
+            <action issue="NET-400" dev="sebb" type="update" due-to="David Kocher">
+            Option to override SSL negotiation. Make FTPSClient#execAuth() and FTPSClient#sslNegotiation() protected
+            </action>
             <action issue="NET-402" dev="sebb" type="fix">
             IMAP, NNTP, POP3 and SMTP classes uses BufferedReader for control channel, which does not follow the standard.
             Changed reader to CRLFLineReader.

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=1089269&r1=1089268&r2=1089269&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSClient.java Tue Apr  5 22:15:51 2011
@@ -211,7 +211,7 @@ public class FTPSClient extends FTPClien
      * @throws IOException If an I/O error occurs while either sending
      * the command.
      */
-    private void execAUTH() throws SSLException, IOException {
+    protected void execAUTH() throws SSLException, IOException {
         int replyCode = sendCommand(CMD_AUTH, auth);
         if (FTPReply.SECURITY_MECHANISM_IS_OK == replyCode) {
             // replyCode = 334
@@ -236,7 +236,7 @@ public class FTPSClient extends FTPClien
      * connection and carries out handshake processing.
      * @throws IOException If server negotiation fails
      */
-    private void sslNegotiation() throws IOException {
+    protected void sslNegotiation() throws IOException {
         plainSocket = _socket_;
         initSslContext();