(axis-axis2-java-core) branch master updated: AXIS2-6073, fix HTTPS support by getting 'scheme' from URI instance
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 3ba7f5fa95 AXIS2-6073, fix HTTPS support by getting 'scheme' from URI instance 3ba7f5fa95 is described below commit 3ba7f5fa95212cdb170dca13286c09f4e554ff83 Author: Robert Lazarski AuthorDate: Sat Dec 14 19:27:59 2024 -1000 AXIS2-6073, fix HTTPS support by getting 'scheme' from URI instance --- .../axis2/transport/http/impl/httpclient5/RequestImpl.java | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/RequestImpl.java b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/RequestImpl.java index b51a004a57..f99430a32c 100644 --- a/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/RequestImpl.java +++ b/modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/RequestImpl.java @@ -103,11 +103,19 @@ final class RequestImpl implements Request { } int port = requestUri.getPort(); String protocol; + // AXIS2-6073 + // This may always be null here, HttpUriRequestBase has the scheme but is unused? + // And also, protocol doesn't need to be set on HttpUriRequestBase? if (this.httpRequestMethod.getVersion() != null && this.httpRequestMethod.getVersion().getProtocol() != null) { protocol = this.httpRequestMethod.getVersion().getProtocol(); +log.debug("Received protocol from this.httpRequestMethod.getVersion().getProtocol(): " + protocol); +} else if (requestUri.getScheme() != null) { + protocol = requestUri.getScheme(); +log.debug("Received protocol from requestUri.getScheme(): " + protocol); } else { protocol = "http"; - } +log.warn("Cannot find protocol, using default as http on requestUri: " + requestUri); + } if (port == -1) { if (HTTPTransportConstants.PROTOCOL_HTTP.equals(protocol)) { port = 80;
(axis-axis2-java-core) branch master updated: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2
This is an automated email from the ASF dual-hosted git repository. veithen 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 8729044b05 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 8729044b05 is described below commit 8729044b052b6608f4670cf240cf1c0e51257f68 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Dec 9 13:36:22 2024 + Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.11.1...maven-javadoc-plugin-3.11.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 538794388c..51a3202411 100644 --- a/pom.xml +++ b/pom.xml @@ -1057,7 +1057,7 @@ maven-javadoc-plugin -3.11.1 +3.11.2 8 false
(axis-axis2-java-core) branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.2 deleted (was bbe6e6af6f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.2 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git was bbe6e6af6f Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.