This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git


The following commit(s) were added to refs/heads/master by this push:
     new e1149ce8 FTPSClient execPROT removes proxy settings #90.
e1149ce8 is described below

commit e1149ce83cf9713160cbac196dc61133fd559800
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Nov 7 10:26:34 2022 -0500

    FTPSClient execPROT removes proxy settings #90.
    
    Lower visibility of method back
---
 src/changes/changes.xml                                 | 3 +++
 src/main/java/org/apache/commons/net/ftp/FTPClient.java | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cfec29f7..cbc70e07 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -77,6 +77,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="NET-711" type="fix" dev="ggregory" due-to="Jochen 
Wiedmann, Gary Gregory">
         Add FTP option to toggle use of return host like CURL.
       </action>
+      <action issue="NET-642" type="fix" dev="ggregory" due-to="Yani Mihaylov, 
Gary Gregory">
+        FTPSClient execPROT removes proxy settings #90.
+      </action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory">
         [FTP] Add FTPClient.mdtmInstant(String).
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java 
b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 2d2d726f..5edb8ef6 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -1705,7 +1705,7 @@ public class FTPClient extends FTP implements 
Configurable {
      *
      * @return The client port for active mode.
      */
-    protected int getActivePort()
+    int getActivePort()
     {
         if (activeMinPort > 0 && activeMaxPort >= activeMinPort)
         {
@@ -1871,7 +1871,7 @@ public class FTPClient extends FTP implements 
Configurable {
      * @return __activeExternalHost if non-null, else getLocalAddress()
      * @see #setActiveExternalIPAddress(String)
      */
-    protected InetAddress getHostAddress()
+    InetAddress getHostAddress()
     {
         if (activeExternalHost != null)
         {
@@ -1992,7 +1992,7 @@ public class FTPClient extends FTP implements 
Configurable {
      *
      * @return __reportActiveExternalHost if non-null, else getHostAddress();
      */
-    protected InetAddress getReportHostAddress() {
+    InetAddress getReportHostAddress() {
         if (reportActiveExternalHost != null) {
             return reportActiveExternalHost ;
         }

Reply via email to