NET-538 - FTPHTTPClient should use socket factory to create sockets

sebbASF · sebbASF · commit f6d1a4d9d0fa · 2015-06-04T12:04:34.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/trunk@1683528 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -62,7 +62,7 @@ The <action> type attribute can be add,update,fix,remove.
      -->
 
     <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 further details below.
   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>
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -109,7 +109,7 @@ protected Socket _openDataConnection_(String command, String arg)
             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 @@ protected Socket _openDataConnection_(String command, String arg)
     @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;
