[Bug 64937] java.io.IOException: Connection reset by peer
https://bz.apache.org/bugzilla/show_bug.cgi?id=64937 mgrigorov changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from mgrigorov --- "java.io.IOException: Connection reset by peer" means that the client/browser closed the connection before Tomcat being able to write the response. For more help please use us...@tomcat.apache.org mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64937] New: java.io.IOException: Connection reset by peer
https://bz.apache.org/bugzilla/show_bug.cgi?id=64937 Bug ID: 64937 Summary: java.io.IOException: Connection reset by peer Product: Tomcat 8 Version: 8.5.x-trunk Hardware: Other OS: Linux Status: NEW Severity: blocker Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: schodipa...@cloudleaf.io Target Milestone: Hi, I am getting the below error in logs for my spring boot application running on tomcat 8.5 that is installed on Kubernetes with Linux os. Please let me know how to debug this error and resolve it. Error class: org.apache.catalina.connector.ClientAbortException Error Message java.io.IOException: Connection reset by peer org.apache.catalina.connector.OutputBuffer.realWriteBytes(OutputBuffer.java:393) at org.apache.tomcat.util.buf.ByteChunk.flushBuffer(ByteChunk.java:426) at org.apache.tomcat.util.buf.ByteChunk.append(ByteChunk.java:339) at org.apache.catalina.connector.OutputBuffer.writeBytes(OutputBuffer.java:418) at org.apache.catalina.connector.OutputBuffer.write(OutputBuffer.java:406) at org.apache.catalina.connector.CoyoteOutputStream.write(CoyoteOutputStream.java:97) at org.springframework.security.web.util.OnCommittedResponseWrapper$SaveContextServletOutputStream.write(OnCommittedResponseWrapper.java:639) at org.springframework.security.web.util.OnCommittedResponseWrapper$SaveContextServletOutputStream.write(OnCommittedResponseWrapper.java:639) at org.springframework.util.StreamUtils.copy(StreamUtils.java:138) at org.springframework.http.converter.ResourceHttpMessageConverter.writeContent(ResourceHttpMessageConverter.java:110) at org.springframework.http.converter.ResourceHttpMessageConverter.writeInternal(ResourceHttpMessageConverter.java:102) at org.springframework.http.converter.ResourceHttpMessageConverter.writeInternal(ResourceHttpMessageConverter.java:45) at org.springframework.http.converter.AbstractHttpMessageConverter.write(AbstractHttpMessageConverter.java:228) at org.springframework.web.servlet.resource.ResourceHttpRequestHandler.handleRequest(ResourceHttpRequestHandler.java:480) at org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter.handle(HttpRequestHandlerAdapter.java:51) at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:967) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:901) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:970) at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:861) at javax.servlet.http.HttpServlet.service(HttpServlet.java:622) at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:846) at javax.servlet.http.HttpServlet.service(HttpServlet.java:729) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:291) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.springframework.boot.web.filter.ApplicationContextHeaderFilter.doFilterInternal(ApplicationContextHeaderFilter.java:54) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.springframework.security.web.authentication.switchuser.SwitchUserFilter.doFilter(SwitchUserFilter.java:200) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter.doFilter(RememberMeAuthenticationFilter.java:158) at com.cloudleaf.cloudos.security.CloudLeafRememberMeAuthenticationFilter.doFilter(CloudLeafRememberMeAuthenticationFilter.java:59) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239) at org.apache.catalina.core.ApplicationFilterChain.doFil
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2551 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] c44121bb981bf2d75458549b24526a6a9e35969e Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1821 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 26492bc1dedbf6a4bd1b1b58863d55935baa5b40 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/558 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 2232ca8569174d1a3f0d850d3e66be7d388b2f2a Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5566 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] abab1a48e0d4bab8a1508a88aa09cf72d2e20e7d Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix test broken by BZ 56181
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 26492bc Fix test broken by BZ 56181
26492bc is described below
commit 26492bc1dedbf6a4bd1b1b58863d55935baa5b40
Author: Mark Thomas
AuthorDate: Thu Nov 26 21:10:54 2020 +
Fix test broken by BZ 56181
---
test/org/apache/catalina/valves/TestRemoteIpValve.java | 6 ++
1 file changed, 6 insertions(+)
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 557396c..4026139 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -92,6 +93,11 @@ public class TestRemoteIpValve {
}
public static class MockRequest extends Request {
+
+public MockRequest() {
+setConnector(new Connector());
+}
+
@Override
public void setAttribute(String name, Object value) {
getCoyoteRequest().getAttributes().put(name, value);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix test broken by BZ 56181
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c44121b Fix test broken by BZ 56181
c44121b is described below
commit c44121bb981bf2d75458549b24526a6a9e35969e
Author: Mark Thomas
AuthorDate: Thu Nov 26 21:10:54 2020 +
Fix test broken by BZ 56181
---
test/org/apache/catalina/valves/TestRemoteIpValve.java | 6 ++
1 file changed, 6 insertions(+)
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index c1240ad..ae5783c 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -92,6 +93,11 @@ public class TestRemoteIpValve {
}
public static class MockRequest extends Request {
+
+public MockRequest() {
+setConnector(new Connector());
+}
+
@Override
public void setAttribute(String name, Object value) {
getCoyoteRequest().getAttributes().put(name, value);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix test broken by BZ 56181
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2232ca8 Fix test broken by BZ 56181
2232ca8 is described below
commit 2232ca8569174d1a3f0d850d3e66be7d388b2f2a
Author: Mark Thomas
AuthorDate: Thu Nov 26 21:10:54 2020 +
Fix test broken by BZ 56181
---
test/org/apache/catalina/valves/TestRemoteIpValve.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index a792552..1c7b24a 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -94,7 +95,7 @@ public class TestRemoteIpValve {
public static class MockRequest extends Request {
public MockRequest() {
-super(null);
+super(new Connector());
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix test broken by BZ 56181
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new abab1a4 Fix test broken by BZ 56181
abab1a4 is described below
commit abab1a48e0d4bab8a1508a88aa09cf72d2e20e7d
Author: Mark Thomas
AuthorDate: Thu Nov 26 21:10:54 2020 +
Fix test broken by BZ 56181
---
test/org/apache/catalina/valves/TestRemoteIpValve.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java
b/test/org/apache/catalina/valves/TestRemoteIpValve.java
index 286a18c..e95b30b 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -94,7 +95,7 @@ public class TestRemoteIpValve {
public static class MockRequest extends Request {
public MockRequest() {
-super(null);
+super(new Connector());
}
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2550 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] f5500fd980f4d8c7b5593dd77b5896346dd9d626 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1820 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 2e832afd3ba43f7f09d6a58e0d583e140c94b617 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5565 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 479a6a932181ee76d316dfec3bfeeaf39c0a2a6d Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/557 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 524e2ccd3fdf3ffb2830a43c414691bcbcb5f234 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56181] RemoteIpValve & RemoteIpFilter: HttpServletRequest.getRemoteHost() returns IP instead of hostname with enableLookups=true and x-forwarded-for header
https://bz.apache.org/bugzilla/show_bug.cgi?id=56181 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Fixed in: - 10.0.x for 10.0.0-M11 onwards - 9.0.x for 9.0.41 onwards - 8.5.x for 8.5.61 onwards - 7.0.x for 7.0.108 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 2e832af Fix BZ 56181 - return correct remoteHost with
RemoteIP[Valve|Filter]
2e832af is described below
commit 2e832afd3ba43f7f09d6a58e0d583e140c94b617
Author: Mark Thomas
AuthorDate: Thu Nov 26 18:57:25 2020 +
Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 42 +-
.../apache/catalina/valves/LocalStrings.properties | 2 +-
.../catalina/valves/LocalStrings_es.properties | 1 -
java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
webapps/docs/changelog.xml | 10 ++
webapps/docs/config/filter.xml | 6
7 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 188176d..ed04087 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -17,6 +17,8 @@
package org.apache.catalina.filters;
import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -160,6 +162,13 @@ import org.apache.tomcat.util.res.StringManager;
* integer
* 443
*
+ *
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ *
*
*
* Regular expression vs. IP address blocks:
mod_remoteip allows to use address blocks (e.g.
@@ -676,6 +685,8 @@ public class RemoteIpFilter implements Filter {
protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
/**
* Convert a given comma delimited list of regular expressions into an
array of String
*
@@ -765,6 +776,8 @@ public class RemoteIpFilter implements Filter {
*/
private Pattern trustedProxies = null;
+private boolean enableLookups;
+
@Override
public void destroy() {
// NOOP
@@ -820,7 +833,22 @@ public class RemoteIpFilter implements Filter {
if (remoteIp != null) {
xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress =
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
if (proxiesHeaderValue.size() == 0) {
xRequest.removeHeader(proxiesHeader);
@@ -1010,6 +1038,10 @@ public class RemoteIpFilter implements Filter {
return trustedProxies;
}
+public boolean getEnableLookups() {
+return enableLookups;
+}
+
@Override
public void init(FilterConfig filterConfig) throws Servlet
[tomcat] branch 8.5.x updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f5500fd Fix BZ 56181 - return correct remoteHost with
RemoteIP[Valve|Filter]
f5500fd is described below
commit f5500fd980f4d8c7b5593dd77b5896346dd9d626
Author: Mark Thomas
AuthorDate: Thu Nov 26 18:57:25 2020 +
Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 42 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
webapps/docs/changelog.xml | 6
webapps/docs/config/filter.xml | 6
6 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index bb59282..fffba9d 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -17,6 +17,8 @@
package org.apache.catalina.filters;
import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -162,6 +164,13 @@ import org.apache.tomcat.util.res.StringManager;
* integer
* 443
*
+ *
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ *
*
*
* Regular expression vs. IP address blocks:
mod_remoteip allows to use address blocks (e.g.
@@ -678,6 +687,8 @@ public class RemoteIpFilter implements Filter {
protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
/**
* Convert a given comma delimited list of regular expressions into an
array of String
*
@@ -770,6 +781,8 @@ public class RemoteIpFilter implements Filter {
*/
private Pattern trustedProxies = null;
+private boolean enableLookups;
+
@Override
public void destroy() {
// NOOP
@@ -825,7 +838,22 @@ public class RemoteIpFilter implements Filter {
if (remoteIp != null) {
xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress =
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
if (proxiesHeaderValue.size() == 0) {
xRequest.removeHeader(proxiesHeader);
@@ -1015,6 +1043,10 @@ public class RemoteIpFilter implements Filter {
return trustedProxies;
}
+public boolean getEnableLookups() {
+return enableLookups;
+}
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
if (filterConfig.getInitParameter(INTERNA
[tomcat] branch 9.0.x updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 524e2cc Fix BZ 56181 - return correct remoteHost with
RemoteIP[Valve|Filter]
524e2cc is described below
commit 524e2ccd3fdf3ffb2830a43c414691bcbcb5f234
Author: Mark Thomas
AuthorDate: Thu Nov 26 18:57:25 2020 +
Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 41 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
webapps/docs/changelog.xml | 6
webapps/docs/config/filter.xml | 6
6 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index e8a42da..72ea1e2 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -18,6 +18,8 @@ package org.apache.catalina.filters;
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -166,6 +168,13 @@ import org.apache.tomcat.util.res.StringManager;
* integer
* 443
*
+ *
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ *
*
*
* Regular expression vs. IP address blocks:
mod_remoteip allows to use address blocks (e.g.
@@ -681,6 +690,8 @@ public class RemoteIpFilter extends GenericFilter {
protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
/**
* Convert a given comma delimited list of regular expressions into an
array of String
*
@@ -773,6 +784,8 @@ public class RemoteIpFilter extends GenericFilter {
*/
private Pattern trustedProxies = null;
+private boolean enableLookups;
+
public void doFilter(HttpServletRequest request, HttpServletResponse
response, FilterChain chain) throws IOException, ServletException {
boolean isInternal = internalProxies != null &&
@@ -823,7 +836,22 @@ public class RemoteIpFilter extends GenericFilter {
if (remoteIp != null) {
xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress =
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
if (proxiesHeaderValue.size() == 0) {
xRequest.removeHeader(proxiesHeader);
@@ -1013,6 +1041,10 @@ public class RemoteIpFilter extends GenericFilter {
return trustedProxies;
}
+public boolean getEnableL
[tomcat] branch master updated: Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 479a6a9 Fix BZ 56181 - return correct remoteHost with
RemoteIP[Valve|Filter]
479a6a9 is described below
commit 479a6a932181ee76d316dfec3bfeeaf39c0a2a6d
Author: Mark Thomas
AuthorDate: Thu Nov 26 18:57:25 2020 +
Fix BZ 56181 - return correct remoteHost with RemoteIP[Valve|Filter]
https://bz.apache.org/bugzilla/show_bug.cgi?id=56181
---
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 41 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
java/org/apache/catalina/valves/RemoteIpValve.java | 19 +-
webapps/docs/changelog.xml | 6
webapps/docs/config/filter.xml | 6
6 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 2e9f564..5877b76 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index e37859b..e20faee 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -18,6 +18,8 @@ package org.apache.catalina.filters;
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -166,6 +168,13 @@ import org.apache.tomcat.util.res.StringManager;
* integer
* 443
*
+ *
+ * enableLookups
+ * Should a DNS lookup be performed to provide a host name when calling
{@link ServletRequest#getRemoteHost()}
+ * N/A
+ * boolean
+ * false
+ *
*
*
* Regular expression vs. IP address blocks:
mod_remoteip allows to use address blocks (e.g.
@@ -681,6 +690,8 @@ public class RemoteIpFilter extends GenericFilter {
protected static final String TRUSTED_PROXIES_PARAMETER = "trustedProxies";
+protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups";
+
/**
* Convert a given comma delimited list of regular expressions into an
array of String
*
@@ -773,6 +784,8 @@ public class RemoteIpFilter extends GenericFilter {
*/
private Pattern trustedProxies = null;
+private boolean enableLookups;
+
public void doFilter(HttpServletRequest request, HttpServletResponse
response, FilterChain chain) throws IOException, ServletException {
boolean isInternal = internalProxies != null &&
@@ -823,7 +836,22 @@ public class RemoteIpFilter extends GenericFilter {
if (remoteIp != null) {
xRequest.setRemoteAddr(remoteIp);
-xRequest.setRemoteHost(remoteIp);
+if (getEnableLookups()) {
+// This isn't a lazy lookup but that would be a little more
+// invasive - mainly in XForwardedRequest - and if
+// enableLookups is true is seems reasonable that the
+// hostname will be required so look it up here.
+try {
+InetAddress inetAddress =
InetAddress.getByName(remoteIp);
+// We know we need a DNS look up so use
getCanonicalHostName()
+
xRequest.setRemoteHost(inetAddress.getCanonicalHostName());
+} catch (UnknownHostException e) {
+
log.debug(sm.getString("remoteIpFilter.invalidRemoteAddress", remoteIp), e);
+xRequest.setRemoteHost(remoteIp);
+}
+} else {
+xRequest.setRemoteHost(remoteIp);
+}
if (proxiesHeaderValue.size() == 0) {
xRequest.removeHeader(proxiesHeader);
@@ -1013,6 +1041,10 @@ public class RemoteIpFilter extends GenericFilter {
return trustedProxies;
}
+public boolean getEnabl
[Bug 64110] Record TLS protocol in access log for connections with a failed TLS handshake
https://bz.apache.org/bugzilla/show_bug.cgi?id=64110 --- Comment #2 from Mark Thomas --- https://github.com/apache/tomcat/pull/380 submitted for feedback. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf opened a new pull request #380: Fix BZ 64110 - request attr for requested ciphers and protocols
markt-asf opened a new pull request #380: URL: https://github.com/apache/tomcat/pull/380 https://bz.apache.org/bugzilla/show_bug.cgi?id=64110 I'm providing a PR for this one as the additional attributes to add some additional overhead. The overhead is limited to keeping two lists of strings: one of requested protocol names and one of requested cipher names. In both cases the names are already in memory so the footprint will be limited to the lists and array of object references. The exceptions are the relatively new GREASE values (see RFC 8701). I don't think they'll cause too much overhead (and there are ways to workaround that if they do - namely do exactly what RFC 8701 doesn't want us to do and enumerate them). This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] pmouawad commented on pull request #376: Implement Bug 64877
pmouawad commented on pull request #376: URL: https://github.com/apache/tomcat/pull/376#issuecomment-734270073 Thanks Remy ! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62695] Provide sha512 checksums for Tomcat releases published to Maven
https://bz.apache.org/bugzilla/show_bug.cgi?id=62695 --- Comment #5 from Michael Osipov --- Please note: https://github.com/apache/tomcat/commit/997ea27b77fe08db2bc19bdb8b15ddbde9662675#r44558572 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56890] getRealPath returns null
https://bz.apache.org/bugzilla/show_bug.cgi?id=56890 --- Comment #8 from Mark Thomas --- Updating the location again: https://github.com/eclipse-ee4j/servlet-api/issues/105 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64872] Inefficient enum resolution in JSPs
https://bz.apache.org/bugzilla/show_bug.cgi?id=64872 --- Comment #26 from Mark Thomas --- The duplication of the try/catch and Type.valueOf() struck me as too much to duplicate for the numerical types. char and boolean were much more borderline whether it there was enough code duplication to merit merging them. In the end I opted not to but you could probably make a case for either approach. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #379: Fix BZ 64080 - graceful close
markt-asf closed pull request #379: URL: https://github.com/apache/tomcat/pull/379 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62695] Provide sha512 checksums for Tomcat releases published to Maven
https://bz.apache.org/bugzilla/show_bug.cgi?id=62695 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Maven Resolver Ant Tasks 1.3.0 includes the necessary functionality. Fixed in: - 10.0.x for 10.0.0-M11 onwards - 9.0.x for 9.0.41 onwards - 8.5.x for 8.5.61 onwards - 7.0.x for 7.0.108 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5bb694178b8df9e0f0dce987f43dd5e3d3e11823
Author: Mark Thomas
AuthorDate: Wed Nov 25 20:31:35 2020 +
Update to Maven Ant Resolver Tasks 1.3.0
---
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 1888d5b..6eda85f 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -61,7 +61,7 @@ tomcat.pom.path=../../res/maven
base.path=${user.home}/tomcat-build-libs
# - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d4c5bb9..f7c5ec3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,9 @@
64931: Implement validation of changelog.xml
file at build time. (kkolinko)
+
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 5a406fb6af6e47b35e1f089bf9cc3641c74a0233 Author: Mark Thomas AuthorDate: Wed Nov 25 20:32:01 2020 + Provide SHA-256 and SHA-512 hashes for releases via Maven --- res/maven/mvn-pub.xml | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml index 9fd938b..d14e68f 100644 --- a/res/maven/mvn-pub.xml +++ b/res/maven/mvn-pub.xml @@ -23,6 +23,7 @@ + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f7c5ec3..58a5f98 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -138,6 +138,10 @@ Update to Maven Ant Resolver Tasks 1.3.0. (markt) + +62695: Provide SHA-256 and SHA-512 checksums for files +published via Maven. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated (dadf3ad -> 5a406fb)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from dadf3ad Update Tomcat 7.0.107 release date new 5bb6941 Update to Maven Ant Resolver Tasks 1.3.0 new 5a406fb Provide SHA-256 and SHA-512 hashes for releases via Maven The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: res/maven/mvn-pub.xml| 1 + res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 7 +++ 3 files changed, 9 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c1ac63a3fad1db985e553d8e01f5a2eeb0f6fc3c
Author: Mark Thomas
AuthorDate: Wed Nov 25 20:31:35 2020 +
Update to Maven Ant Resolver Tasks 1.3.0
---
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e98efe5..3615f18 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -61,7 +61,7 @@ tomcat.pom.path=../../res/maven
base.path=${user.home}/tomcat-build-libs
# - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 591adbe..a01d742 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,9 @@
64931: Implement validation of changelog.xml
file at build time. (kkolinko)
+
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0b32b01e5fb7abb477f30bfd13327d76ef97e766 Author: Mark Thomas AuthorDate: Wed Nov 25 20:32:01 2020 + Provide SHA-256 and SHA-512 hashes for releases via Maven --- res/maven/mvn-pub.xml | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml index 17d64a9..16b67a8 100644 --- a/res/maven/mvn-pub.xml +++ b/res/maven/mvn-pub.xml @@ -23,6 +23,7 @@ + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a01d742..9bcaca5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -132,6 +132,10 @@ Update to Maven Ant Resolver Tasks 1.3.0. (markt) + +62695: Provide SHA-256 and SHA-512 checksums for files +published via Maven. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (987be34 -> 0b32b01)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 987be34 Fix regression in async Servlet examples new c1ac63a Update to Maven Ant Resolver Tasks 1.3.0 new 0b32b01 Provide SHA-256 and SHA-512 hashes for releases via Maven The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: res/maven/mvn-pub.xml| 1 + res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 7 +++ 3 files changed, 9 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 39fa9e55ce8a71abdb196c2241cff027924ce374 Author: Mark Thomas AuthorDate: Wed Nov 25 20:32:01 2020 + Provide SHA-256 and SHA-512 hashes for releases via Maven --- res/maven/mvn-pub.xml | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml index 76b786c..06dd829 100644 --- a/res/maven/mvn-pub.xml +++ b/res/maven/mvn-pub.xml @@ -23,6 +23,7 @@ + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7c3eb30..c115443 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ Update to Maven Ant Resolver Tasks 1.3.0. (markt) + +62695: Provide SHA-256 and SHA-512 checksums for files +published via Maven. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b8a3e31400ae6e25d237315467dc4c47e40cdfe
Author: Mark Thomas
AuthorDate: Wed Nov 25 20:31:35 2020 +
Update to Maven Ant Resolver Tasks 1.3.0
---
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index b87c5df..e2176fd 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -59,7 +59,7 @@ tomcat.pom.path=../../res/maven
base.path=${user.home}/tomcat-build-libs
# - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb963b6..7c3eb30 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,9 @@
64931: Implement validation of changelog.xml
file at build time. (kkolinko)
+
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (b1133ad -> 39fa9e5)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from b1133ad Fix BZ 64080 - graceful close new 1b8a3e3 Update to Maven Ant Resolver Tasks 1.3.0 new 39fa9e5 Provide SHA-256 and SHA-512 hashes for releases via Maven The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: res/maven/mvn-pub.xml| 1 + res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 7 +++ 3 files changed, 9 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (a1cbdab -> 997ea27)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from a1cbdab Fix BZ 64080 - graceful close new 02b9683 Update to Maven Ant Resolver Tasks 1.3.0 new 997ea27 Provide SHA-256 and SHA-512 hashes for releases via Maven The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: res/maven/mvn-pub.xml| 1 + res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 7 +++ 3 files changed, 9 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Provide SHA-256 and SHA-512 hashes for releases via Maven
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 997ea27b77fe08db2bc19bdb8b15ddbde9662675 Author: Mark Thomas AuthorDate: Wed Nov 25 20:32:01 2020 + Provide SHA-256 and SHA-512 hashes for releases via Maven --- res/maven/mvn-pub.xml | 1 + webapps/docs/changelog.xml | 4 2 files changed, 5 insertions(+) diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml index 4ab26f7..99ffb9e 100644 --- a/res/maven/mvn-pub.xml +++ b/res/maven/mvn-pub.xml @@ -23,6 +23,7 @@ + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7595c2d..3743633 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -145,6 +145,10 @@ Update to Maven Ant Resolver Tasks 1.3.0. (markt) + +62695: Provide SHA-256 and SHA-512 checksums for files +published via Maven. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update to Maven Ant Resolver Tasks 1.3.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 02b968334d3d3029fbe543d9f5291a150bec5bc0
Author: Mark Thomas
AuthorDate: Wed Nov 25 20:31:35 2020 +
Update to Maven Ant Resolver Tasks 1.3.0
---
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 2c756e3..e00e7e2 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -59,7 +59,7 @@ tomcat.pom.path=../../res/maven
base.path=${user.home}/tomcat-build-libs
# - Maven Ant Tasks -
-maven-resolver-ant-tasks.version=1.2.0
+maven-resolver-ant-tasks.version=1.3.0
maven-resolver-ant-tasks.home=${base.path}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}
maven-resolver-ant-tasks.loc=https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven-resolver-ant-tasks.version}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
maven-resolver-ant-tasks.jar=${maven-resolver-ant-tasks.home}/maven-resolver-ant-tasks-${maven-resolver-ant-tasks.version}-uber.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5603d10..7595c2d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -142,6 +142,9 @@
64931: Implement validation of changelog.xml
file at build time. (kkolinko)
+
+Update to Maven Ant Resolver Tasks 1.3.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
