From e1149ce83cf9713160cbac196dc61133fd559800 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 7 Nov 2022 10:26:34 -0500 Subject: [PATCH] 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 cfec29f73..cbc70e07e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -77,6 +77,9 @@ The type attribute can be add,update,fix,remove. Add FTP option to toggle use of return host like CURL. + + FTPSClient execPROT removes proxy settings #90. + [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 2d2d726f3..5edb8ef62 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 String[] featureValues(final String feature) throws IOException { * * @return The client port for active mode. */ - protected int getActivePort() + int getActivePort() { if (activeMinPort > 0 && activeMaxPort >= activeMinPort) { @@ -1871,7 +1871,7 @@ FTPFileEntryParser getEntryParser() { * @return __activeExternalHost if non-null, else getLocalAddress() * @see #setActiveExternalIPAddress(String) */ - protected InetAddress getHostAddress() + InetAddress getHostAddress() { if (activeExternalHost != null) { @@ -1992,7 +1992,7 @@ public int getReceiveDataSocketBufferSize() { * * @return __reportActiveExternalHost if non-null, else getHostAddress(); */ - protected InetAddress getReportHostAddress() { + InetAddress getReportHostAddress() { if (reportActiveExternalHost != null) { return reportActiveExternalHost ; }