This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new ce77042dad AXIS2-5948 Proxy settings ignored if username not specified
ce77042dad is described below
commit ce77042dade45dc0650654707fd1282d2a42316d
Author: Robert Lazarski <[email protected]>
AuthorDate: Sun Oct 27 09:37:30 2024 -1000
AXIS2-5948 Proxy settings ignored if username not specified
---
.../http/impl/httpclient5/HTTPProxyConfigurator.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPProxyConfigurator.java
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPProxyConfigurator.java
index e8ff9782fe..1530697954 100644
---
a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPProxyConfigurator.java
+++
b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPProxyConfigurator.java
@@ -145,16 +145,14 @@ public class HTTPProxyConfigurator {
// AXIS2-6051, CredentialsProvider no longer has
setCredentialsProvider() however BasicCredentialsProvider
// does have it. clientContext.getCredentialsProvider() returns
CredentialsProvider.
- HttpHost proxy = new HttpHost(proxyHost, proxyPort);
if (proxyCredentials != null) {
- if (clientContext.getCredentialsProvider() == null) {
- BasicCredentialsProvider credsProvider = new
BasicCredentialsProvider();
- clientContext.setCredentialsProvider(credsProvider);
- credsProvider.setCredentials(new AuthScope(null, -1),
proxyCredentials);
- }
requestConfig.setAuthenticationEnabled(true);
- requestConfig.setProxy(proxy);
+ BasicCredentialsProvider credsProvider = new
BasicCredentialsProvider();
+ clientContext.setCredentialsProvider(credsProvider);
+ credsProvider.setCredentials(new AuthScope(null, -1),
proxyCredentials);
}
+ HttpHost proxy = new HttpHost(proxyHost, proxyPort);
+ requestConfig.setProxy(proxy);
}
private static OMElement getProxyConfigurationElement(Parameter
proxySettingsFromAxisConfig)
