commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1683528 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
Date Thu, 04 Jun 2015 12:04:34 GMT
Author: sebb
Date: Thu Jun  4 12:04:34 2015
New Revision: 1683528

URL: http://svn.apache.org/r1683528
Log:
NET-538 - FTPHTTPClient should use socket factory to create sockets

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.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=1683528&r1=1683527&r2=1683528&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Thu Jun  4 12:04:34 2015
@@ -62,7 +62,7 @@ The <action> type attribute can be add,u
      -->
 
     <body>
-        <release version="3.4" date="2015-01-??" description="
+        <release version="3.4" date="2015-??-??" description="
 This is mainly a bug-fix release. See further details below.
 
   This release is binary compatible with previous releases.
@@ -72,6 +72,9 @@ This is mainly a bug-fix release. See fu
   IMAPExportMbox (example app) allows IMAP folders to be exported into an mbox file.
   This is the inverse of the IMAPImportMbox example added previously
         ">
+            <action issue="NET-538" type="fix" dev="sebb" due-to="Dzmitry">
+            FTPHTTPClient should use socket factory to create sockets
+            </action>
             <action issue="NET-566" type="fix" dev="sebb" due-to="Gary Russell">
             UnixFTPEntryParser Drops Leading Spaces from File Names
             </action>

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java?rev=1683528&r1=1683527&r2=1683528&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java Thu
Jun  4 12:04:34 2015
@@ -109,7 +109,7 @@ public class FTPHTTPClient extends FTPCl
             passiveHost = this.getPassiveHost();
         }
 
-        Socket socket = new Socket(proxyHost, proxyPort);
+        Socket socket = _socketFactory_.createSocket(proxyHost, proxyPort);
         InputStream is = socket.getInputStream();
         OutputStream os = socket.getOutputStream();
         tunnelHandshake(passiveHost, this.getPassivePort(), is, os);
@@ -129,7 +129,7 @@ public class FTPHTTPClient extends FTPCl
     @Override
     public void connect(String host, int port) throws SocketException, IOException {
 
-        _socket_ = new Socket(proxyHost, proxyPort);
+        _socket_ = _socketFactory_.createSocket(proxyHost, proxyPort);
         _input_ = _socket_.getInputStream();
         _output_ = _socket_.getOutputStream();
         Reader socketIsReader;



Mime
View raw message