[tomcat] branch master updated: Proposed Connector API and XML refactoring
This is an automated email from the ASF dual-hosted git repository. remm 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 92923fe Proposed Connector API and XML refactoring 92923fe is described below commit 92923febadb5d7901747530272302dc3da6311c2 Author: remm AuthorDate: Wed Apr 15 23:04:47 2020 +0200 Proposed Connector API and XML refactoring See https://cwiki.apache.org/confluence/display/TOMCAT/Connector+API+refactoring The basics were relatively easy to do [the XML given in the JIRA is functional] although I have lots of items to finish: testsuite, JMX, storeconfig, some defaults todo, polish [a few shotnames for some class names here and there], documentation (ouch). This is essentially the only way to do to allow progress on the get/set duplication which is quite prevalent in the connector API (in addition to a lot of other cleanups), without this item 2 "Reduce instances of setters and getters for the same property" on the list will have to be given up on. Please indicate if this magnitude of changes is acceptable in Tomcat 10. --- TOMCAT-NEXT.txt | 4 1 file changed, 4 insertions(+) diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt index 129a8c7..e535179 100644 --- a/TOMCAT-NEXT.txt +++ b/TOMCAT-NEXT.txt @@ -29,6 +29,10 @@ New items for 10.0.x onwards: 1. Remove APR connector. + 2. Connector API and XML refactoring + https://cwiki.apache.org/confluence/display/TOMCAT/Connector+API+refactoring +for details. + Deferred until 10.1.x: 1. Remove the ExtensionValidator and associated classes (assuming that the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62072] Add support for request compression
https://bz.apache.org/bugzilla/show_bug.cgi?id=62072 --- Comment #4 from Mark Thomas --- Have a look at org.apache.coyote.http11.filters under java/ If I was going to do this I'd Look at how ChunkedInputFilter and ChunkedOutputFilter are used compared to GzipOutoutFilter and use that as a basis for a new GzipInputFilter class and associated plumbing. This will definitely need lots of test cases. See the equivalent package under test/ -- 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 63943] Add possibility to overwrite remote port with information from header value
https://bz.apache.org/bugzilla/show_bug.cgi?id=63943 --- Comment #7 from Mark Thomas --- Because users want to write applications that "just work" irrespective of whether there is a reverse proxy in front of Tomcat and/or how that reverse proxy is configured. -- 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
Re: API Change - Connector.java Constructor
On Fri, Apr 10, 2020 at 6:32 PM Filip Hanik wrote:
>
>
> On Fri, Apr 10, 2020 at 1:28 AM Rémy Maucherat wrote:
>
>>
>>
>>> This configuration gives the impression that the Endpoint is a child of
>>> the Connector.
>>> But the Connector truly only needs the ProtocolHandler interface to
>>> function. The injected object would then be better to an instance of a
>>> ProtocolHandler
>>>
>>> The XML can of course be configured to instantiate and inject the
>>> ProtocolHandler handler directly into the Connector
>>> In this setting, it doesn't make sense to have any properties on the
>>> Connector, since the Connector receives the protocol handler already
>>> configured.
>>>
>>>
>>> >> maxHeaderCount="10" >
>>> >> port="8443" SSLEnabled="true"
>>>
>>>
>>> sslImplementationName="org.apache.tomcat.util.net.openssl.OpenSSLImplementation">
>>>
>>>
>>> >> certificateKeyFile="${catalina.home}/conf/key.pem"
>>> certificateFile="${catalina.home}/conf/cert.pem"
>>> type="RSA" />
>>>
>>>
>>> >> className="org.apache.coyote.http2.Http2Protocol" />
>>>>>
>>>
>>
>> Either way, I experimented a bit and it's not doable. Too many intrusive
>> changes and impossibility to be compatible.
>>
>
> Sounds good.
>
I started working on it more to make a real attempt and see how it behaves
in practice. Even though the changes are problematic [the biggest
Catalina/Tomcat API break ever, surpassing the TLS configuration changes
earlier], the Connector is still the biggest problem for duplicated
properties and random hacks, including reflection abuse. That's a goal/todo
for 10 so it is worth doing it to put it on review to know if it exceeds
the pain threshold of most.
Rémy
>
> Filip
>
[Bug 63943] Add possibility to overwrite remote port with information from header value
https://bz.apache.org/bugzilla/show_bug.cgi?id=63943 --- Comment #6 from Nicolò Boschi --- Why can't you just read the header value? -- 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 62072] Add support for request compression
https://bz.apache.org/bugzilla/show_bug.cgi?id=62072 --- Comment #3 from Nicolò Boschi --- I'd like to work on that, could someone tell me where the changes need to be made? This is my first issue on tomcat -- 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 8.5.x updated: Move entry to correct section
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 b403654 Move entry to correct section b403654 is described below commit b4036541c8efe7d2e9aa611bd0db5ad2065a8881 Author: Mark Thomas AuthorDate: Wed Apr 15 16:13:54 2020 +0100 Move entry to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 24c02e0..d377c99 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -58,10 +58,6 @@ that use a custom class loader that loads resources from non-standard locations. (markt) - -Include the problematic data in the error message when reporting that -the provided request line contains an invalid component. (markt) - @@ -70,6 +66,10 @@ Move SocketProperties mbean to its own type rather than use a subType to improve robustness with tools. (remm) + +Include the problematic data in the error message when reporting that +the provided request line contains an invalid component. (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: Move entry to correct section
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 ce16f8e Move entry to correct section ce16f8e is described below commit ce16f8e1c9c1f846b3be1d358f940ed3cc2031ca Author: Mark Thomas AuthorDate: Wed Apr 15 16:13:54 2020 +0100 Move entry to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 757c434..cf0d4e8 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -56,10 +56,6 @@ that use a custom class loader that loads resources from non-standard locations. (markt) - -Include the problematic data in the error message when reporting that -the provided request line contains an invalid component. (markt) - @@ -68,6 +64,10 @@ Move SocketProperties mbean to its own type rather than use a subType to improve robustness with tools. (remm) + +Include the problematic data in the error message when reporting that +the provided request line contains an invalid component. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Move entry to correct section
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 d55c093 Move entry to correct section d55c093 is described below commit d55c0934a43974e4a2e98e3cce65101fb1ba1281 Author: Mark Thomas AuthorDate: Wed Apr 15 16:13:54 2020 +0100 Move entry to correct section --- webapps/docs/changelog.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 29628ab..2155942 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -71,10 +71,6 @@ that use a custom class loader that loads resources from non-standard locations. (markt) - -Include the problematic data in the error message when reporting that -the provided request line contains an invalid component. (markt) - @@ -83,6 +79,10 @@ Move SocketProperties mbean to its own type rather than use a subType to improve robustness with tools. (remm) + +Include the problematic data in the error message when reporting that +the provided request line contains an invalid component. (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: Improve reporting of invalid request lines
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 3834041 Improve reporting of invalid request lines
3834041 is described below
commit 3834041925d549cab2562ff8a146e8e9134bd023
Author: Mark Thomas
AuthorDate: Wed Apr 15 16:12:55 2020 +0100
Improve reporting of invalid request lines
---
java/org/apache/coyote/http11/AbstractInputBuffer.java | 16
.../org/apache/coyote/http11/InternalAprInputBuffer.java | 15 ++-
java/org/apache/coyote/http11/InternalInputBuffer.java | 15 ++-
.../org/apache/coyote/http11/InternalNioInputBuffer.java | 15 ++-
java/org/apache/coyote/http11/LocalStrings.properties| 6 +++---
webapps/docs/changelog.xml | 4
6 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/coyote/http11/AbstractInputBuffer.java
b/java/org/apache/coyote/http11/AbstractInputBuffer.java
index 7f9b856..b08194b 100644
--- a/java/org/apache/coyote/http11/AbstractInputBuffer.java
+++ b/java/org/apache/coyote/http11/AbstractInputBuffer.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.http.HeaderUtil;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.HttpParser;
import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -183,6 +184,21 @@ public abstract class AbstractInputBuffer implements
InputBuffer{
}
+protected String parseInvalid(int startPos, byte[] buffer) {
+// Look for the next space
+int pos = startPos;
+while (pos < lastValid && buffer[pos] != 0x20) {
+pos++;
+}
+String result = HeaderUtil.toPrintableString(buffer, startPos, pos -
startPos);
+if (pos == lastValid) {
+// Ran out of buffer rather than found a space
+result = result + "...";
+}
+return result;
+}
+
+
/**
* Implementations are expected to call {@link Request#setStartTime(long)}
* as soon as the first byte is read from the request.
diff --git a/java/org/apache/coyote/http11/InternalAprInputBuffer.java
b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
index bfa769e..6f153a9 100644
--- a/java/org/apache/coyote/http11/InternalAprInputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
@@ -182,7 +182,8 @@ public class InternalAprInputBuffer extends
AbstractInputBuffer {
space = true;
request.method().setBytes(buf, start, pos - start);
} else if (!HttpParser.isToken(buf[pos])) {
-throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
+String invalidMethodValue = parseInvalid(start, buf);
+throw new
IllegalArgumentException(sm.getString("iib.invalidmethod", invalidMethodValue));
}
pos++;
@@ -227,7 +228,8 @@ public class InternalAprInputBuffer extends
AbstractInputBuffer {
// therefore invalid. Trigger error handling.
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget = parseInvalid(start, buf);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
// Spec says single SP but it also says be tolerant of HT
@@ -253,12 +255,14 @@ public class InternalAprInputBuffer extends
AbstractInputBuffer {
questionPos = pos;
} else if (questionPos != -1 &&
!httpParser.isQueryRelaxed(buf[pos])) {
// %nn decoding will be checked at the point of decoding
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget = parseInvalid(start, buf);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
} else if (httpParser.isNotRequestTargetRelaxed(buf[pos])) {
// This is a general check that aims to catch problems early
// Detailed checking of each part of the request target will
// happen in AbstractHttp11Processor#prepareRequest()
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget = parseInvalid(start, buf);
+throw new
[tomcat] branch 8.5.x updated: Improve reporting of invalid request lines
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 331611b Improve reporting of invalid request lines
331611b is described below
commit 331611bd02c90c7c53d0326c61f93880f61eed8b
Author: Mark Thomas
AuthorDate: Wed Apr 15 15:35:00 2020 +0100
Improve reporting of invalid request lines
---
.../apache/coyote/http11/Http11InputBuffer.java| 31 +-
.../apache/coyote/http11/LocalStrings.properties | 6 ++---
webapps/docs/changelog.xml | 4 +++
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index eecac4f..fe9cc96 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -426,10 +426,10 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
request.method().setBytes(byteBuffer.array(),
parsingRequestLineStart,
pos - parsingRequestLineStart);
} else if (!HttpParser.isToken(chr)) {
-byteBuffer.position(byteBuffer.position() - 1);
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
+String invalidMethodValue =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidmethod", invalidMethodValue));
}
}
parsingRequestLinePhase = 3;
@@ -474,7 +474,8 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
// therefore invalid. Trigger error handling.
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
if (chr == Constants.SP || chr == Constants.HT) {
space = true;
@@ -500,14 +501,16 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
// %nn decoding will be checked at the point of decoding
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
} else if (httpParser.isNotRequestTargetRelaxed(chr)) {
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
// This is a general check that aims to catch problems
early
// Detailed checking of each part of the request target
will
// happen in Http11Processor#prepareRequest()
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
}
if (parsingRequestLineQPos >= 0) {
@@ -567,7 +570,8 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
end = pos - 1;
parsingRequestLineEol = true;
} else if (!HttpParser.isHttpProtocol(chr)) {
-throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol"));
+String invalidProtocol =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol",
invalidProtocol));
}
}
@@ -629,6 +633,21 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
+private String parseInvalid(int startPos, ByteBuffer buffer) {
+
[tomcat] branch 9.0.x updated: Improve reporting of invalid request lines
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 9ca36d1 Improve reporting of invalid request lines
9ca36d1 is described below
commit 9ca36d1318bb51b84b9534d5915cfd168ff048c3
Author: Mark Thomas
AuthorDate: Wed Apr 15 15:35:00 2020 +0100
Improve reporting of invalid request lines
---
.../apache/coyote/http11/Http11InputBuffer.java| 31 +-
.../apache/coyote/http11/LocalStrings.properties | 6 ++---
webapps/docs/changelog.xml | 4 +++
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index d4c4dc3..181d631 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -412,10 +412,10 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
request.method().setBytes(byteBuffer.array(),
parsingRequestLineStart,
pos - parsingRequestLineStart);
} else if (!HttpParser.isToken(chr)) {
-byteBuffer.position(byteBuffer.position() - 1);
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
+String invalidMethodValue =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidmethod", invalidMethodValue));
}
}
parsingRequestLinePhase = 3;
@@ -460,7 +460,8 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
// therefore invalid. Trigger error handling.
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
if (chr == Constants.SP || chr == Constants.HT) {
space = true;
@@ -486,14 +487,16 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
// %nn decoding will be checked at the point of decoding
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
} else if (httpParser.isNotRequestTargetRelaxed(chr)) {
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
// This is a general check that aims to catch problems
early
// Detailed checking of each part of the request target
will
// happen in Http11Processor#prepareRequest()
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
}
if (parsingRequestLineQPos >= 0) {
@@ -553,7 +556,8 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
end = pos - 1;
parsingRequestLineEol = true;
} else if (!HttpParser.isHttpProtocol(chr)) {
-throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol"));
+String invalidProtocol =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol",
invalidProtocol));
}
}
@@ -615,6 +619,21 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
+private String parseInvalid(int startPos, ByteBuffer buffer) {
+
[tomcat] branch master updated: Improve reporting of invalid request lines
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 71a0ec7 Improve reporting of invalid request lines
71a0ec7 is described below
commit 71a0ec7f5cefefd80b98c246b215f66efc63211f
Author: Mark Thomas
AuthorDate: Wed Apr 15 15:35:00 2020 +0100
Improve reporting of invalid request lines
---
.../apache/coyote/http11/Http11InputBuffer.java| 31 +-
.../apache/coyote/http11/LocalStrings.properties | 6 ++---
webapps/docs/changelog.xml | 4 +++
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index 2794bfb..8619a32 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -412,10 +412,10 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
request.method().setBytes(byteBuffer.array(),
parsingRequestLineStart,
pos - parsingRequestLineStart);
} else if (!HttpParser.isToken(chr)) {
-byteBuffer.position(byteBuffer.position() - 1);
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
+String invalidMethodValue =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidmethod", invalidMethodValue));
}
}
parsingRequestLinePhase = 3;
@@ -460,7 +460,8 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
// therefore invalid. Trigger error handling.
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
if (chr == Constants.SP || chr == Constants.HT) {
space = true;
@@ -486,14 +487,16 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
// %nn decoding will be checked at the point of decoding
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
} else if (httpParser.isNotRequestTargetRelaxed(chr)) {
// Avoid unknown protocol triggering an additional error
request.protocol().setString(Constants.HTTP_11);
// This is a general check that aims to catch problems
early
// Detailed checking of each part of the request target
will
// happen in Http11Processor#prepareRequest()
-throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
+String invalidRequestTarget =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget",
invalidRequestTarget));
}
}
if (parsingRequestLineQPos >= 0) {
@@ -553,7 +556,8 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
end = pos - 1;
parsingRequestLineEol = true;
} else if (!HttpParser.isHttpProtocol(chr)) {
-throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol"));
+String invalidProtocol =
parseInvalid(parsingRequestLineStart, byteBuffer);
+throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol",
invalidProtocol));
}
}
@@ -615,6 +619,21 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
+private String parseInvalid(int startPos, ByteBuffer buffer) {
+
[Bug 64353] New: Add support for accessing server certificate from TLS context
https://bz.apache.org/bugzilla/show_bug.cgi?id=64353
Bug ID: 64353
Summary: Add support for accessing server certificate from TLS
context
Product: Tomcat 10
Version: 10.0.0-M4
Hardware: All
OS: All
Status: NEW
Severity: enhancement
Priority: P2
Component: Connectors
Assignee: dev@tomcat.apache.org
Reporter: micha...@apache.org
Target Milestone: --
Based on this discussion:
https://www.mail-archive.com/users@tomcat.apache.org/msg134872.html
There should be an option to access the used server certificate from the
current request being served by one TLS context. As easy as:
request.getAttribute("magic_name")
Return would be, similar to client certs, X509Certificate or X509Certificate[].
This requires these changes (non-exhaustive):
* SSLSupport implementations
* Define a new property in SSLSupport and org.apache.catalina.Globals for the
server cert
* org.apache.catalina.util.TLSUtil.isTLSRequestAttribute(String) and its
callers
* org.apache.coyote.AbstractProcessor.populateSslRequestAttributes() to add new
attribute to the request
* SSLValve to read server cert from reverse proxy, CGI var SSL_SERVER_CERT
* AJP and friends to deliver this piece of information
--
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 8.5.x updated: Update settings for Eclipse 4.15
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 516d828 Update settings for Eclipse 4.15 516d828 is described below commit 516d828ebebb9110bb00716e244c5e1ca1140c3b Author: Mark Thomas AuthorDate: Wed Apr 15 12:22:47 2020 +0100 Update settings for Eclipse 4.15 --- res/ide-support/eclipse/java-compiler-errors-warnings.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/ide-support/eclipse/java-compiler-errors-warnings.txt b/res/ide-support/eclipse/java-compiler-errors-warnings.txt index 2905d56..3c1ce23 100644 --- a/res/ide-support/eclipse/java-compiler-errors-warnings.txt +++ b/res/ide-support/eclipse/java-compiler-errors-warnings.txt @@ -18,7 +18,7 @@ # Java -> Compiler -> Errors/Warnings === -The following settings are for Oxygen (Eclipse 4.13) +The following settings are for Eclipse 4.15 W = Warning I = Ignore E = Error @@ -42,6 +42,8 @@ Potential programming problems - Incomplete 'switch' cases on enum- W [ ] Signal even if 'default' case exists + - Unlikely argument type for...- W + [ ] Perfprm strict... - 'switch' is missing 'default' case - I - Potential resource leak - I - 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: Update settings for Eclipse 4.15
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 5fd1cc6 Update settings for Eclipse 4.15 5fd1cc6 is described below commit 5fd1cc683a55ae3be69baef1db3fbfc28211fcf7 Author: Mark Thomas AuthorDate: Wed Apr 15 12:22:47 2020 +0100 Update settings for Eclipse 4.15 --- res/ide-support/eclipse/java-compiler-errors-warnings.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/ide-support/eclipse/java-compiler-errors-warnings.txt b/res/ide-support/eclipse/java-compiler-errors-warnings.txt index 2905d56..3c1ce23 100644 --- a/res/ide-support/eclipse/java-compiler-errors-warnings.txt +++ b/res/ide-support/eclipse/java-compiler-errors-warnings.txt @@ -18,7 +18,7 @@ # Java -> Compiler -> Errors/Warnings === -The following settings are for Oxygen (Eclipse 4.13) +The following settings are for Eclipse 4.15 W = Warning I = Ignore E = Error @@ -42,6 +42,8 @@ Potential programming problems - Incomplete 'switch' cases on enum- W [ ] Signal even if 'default' case exists + - Unlikely argument type for...- W + [ ] Perfprm strict... - 'switch' is missing 'default' case - I - Potential resource leak - I - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Various places where the 4.13 -> 4.15 Eclipse update was missed
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 f2a0232187f275b1316154cf1b7a7d6b21c01a10
Author: Mark Thomas
AuthorDate: Wed Apr 15 12:23:15 2020 +0100
Various places where the 4.13 -> 4.15 Eclipse update was missed
---
build.properties.default| 2 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e044bfd..46ce226 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,7 +129,7 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.13" link at
+# Checksum is from "SHA512 Checksums for 4.15" link at
# http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/
#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/checksum/eclipse-4.15-SUMSSHA512
#
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index c038e17..36d4b68 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 4973d0a..b4aad1f 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -70,7 +70,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index c6c66fa..219c4fd 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.13/ecj-4.13.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 8cb521e..1648953 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.13/ecj-4.13.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${ant.includes}/
1.7
@@ -189,7 +189,7 @@
test
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.15/junit-4.15.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
1.7
-
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 (92fd912 -> f2a0232)
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 92fd912 Additional logging to help debug CI failure new 245a34d Update settings for Eclipse 4.15 new f2a0232 Various places where the 4.13 -> 4.15 Eclipse update was missed 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: build.properties.default | 2 +- res/ide-support/eclipse/eclipse.classpath | 2 +- res/ide-support/eclipse/java-compiler-errors-warnings.txt | 4 +++- res/ide-support/idea/tomcat.iml | 2 +- res/ide-support/netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update settings for Eclipse 4.15
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 245a34d4d1277620d37d45cc6873344cb7298345 Author: Mark Thomas AuthorDate: Wed Apr 15 12:22:47 2020 +0100 Update settings for Eclipse 4.15 --- res/ide-support/eclipse/java-compiler-errors-warnings.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/ide-support/eclipse/java-compiler-errors-warnings.txt b/res/ide-support/eclipse/java-compiler-errors-warnings.txt index 2905d56..3c1ce23 100644 --- a/res/ide-support/eclipse/java-compiler-errors-warnings.txt +++ b/res/ide-support/eclipse/java-compiler-errors-warnings.txt @@ -18,7 +18,7 @@ # Java -> Compiler -> Errors/Warnings === -The following settings are for Oxygen (Eclipse 4.13) +The following settings are for Eclipse 4.15 W = Warning I = Ignore E = Error @@ -42,6 +42,8 @@ Potential programming problems - Incomplete 'switch' cases on enum- W [ ] Signal even if 'default' case exists + - Unlikely argument type for...- W + [ ] Perfprm strict... - 'switch' is missing 'default' case - I - Potential resource leak - I - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Various places where the 4.13 -> 4.15 Eclipse update was missed
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 013affb81f7f237d6191aabd76cbb7f9db677a2d
Author: Mark Thomas
AuthorDate: Wed Apr 15 12:23:15 2020 +0100
Various places where the 4.13 -> 4.15 Eclipse update was missed
---
build.properties.default| 2 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index efc9673..2b8bf3b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,7 +129,7 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.13" link at
+# Checksum is from "SHA512 Checksums for 4.15" link at
# http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/
#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/checksum/eclipse-4.15-SUMSSHA512
#
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index c038e17..36d4b68 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 4973d0a..b4aad1f 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -70,7 +70,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index c6c66fa..219c4fd 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.13/ecj-4.13.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 8cb521e..1648953 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.13/ecj-4.13.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${ant.includes}/
1.7
@@ -189,7 +189,7 @@
test
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
+output/classes:output/testclasses:${base.path}/junit-4.15/junit-4.15.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar
1.7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update settings for Eclipse 4.15
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 6cf8869416245294819114c902634bbc68e53250 Author: Mark Thomas AuthorDate: Wed Apr 15 12:22:47 2020 +0100 Update settings for Eclipse 4.15 --- res/ide-support/eclipse/java-compiler-errors-warnings.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/ide-support/eclipse/java-compiler-errors-warnings.txt b/res/ide-support/eclipse/java-compiler-errors-warnings.txt index 2905d56..3c1ce23 100644 --- a/res/ide-support/eclipse/java-compiler-errors-warnings.txt +++ b/res/ide-support/eclipse/java-compiler-errors-warnings.txt @@ -18,7 +18,7 @@ # Java -> Compiler -> Errors/Warnings === -The following settings are for Oxygen (Eclipse 4.13) +The following settings are for Eclipse 4.15 W = Warning I = Ignore E = Error @@ -42,6 +42,8 @@ Potential programming problems - Incomplete 'switch' cases on enum- W [ ] Signal even if 'default' case exists + - Unlikely argument type for...- W + [ ] Perfprm strict... - 'switch' is missing 'default' case - I - Potential resource leak - I - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (a35efa6 -> 013affb)
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 a35efa6 Additional logging to help debug CI failure new 6cf8869 Update settings for Eclipse 4.15 new 013affb Various places where the 4.13 -> 4.15 Eclipse update was missed 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: build.properties.default | 2 +- res/ide-support/eclipse/eclipse.classpath | 2 +- res/ide-support/eclipse/java-compiler-errors-warnings.txt | 4 +++- res/ide-support/idea/tomcat.iml | 2 +- res/ide-support/netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) - 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: Additional logging to help debug CI failure
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 f3ab699 Additional logging to help debug CI failure
f3ab699 is described below
commit f3ab69947e5663635f37c6dbc951240e7f383269
Author: Mark Thomas
AuthorDate: Wed Apr 15 12:03:04 2020 +0100
Additional logging to help debug CI failure
---
.../websocket/TestWsWebSocketContainerGetOpenSessions.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 5ff4684..8190d6c 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -193,11 +193,11 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
delayCount++;
}
-Assert.assertTrue(Tracker.checkRecord("client1", client1Count));
-Assert.assertTrue(Tracker.checkRecord("client2", client2Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client1",
client1Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client2",
client2Count));
// Note: need to strip leading '/' from path
-Assert.assertTrue(Tracker.checkRecord(server1.substring(1),
server1Count));
-Assert.assertTrue(Tracker.checkRecord(server2.substring(1),
server2Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server1.substring(1), server1Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server2.substring(1), server2Count));
sClient1Server1.close();
sClient1Server2.close();
@@ -384,5 +384,9 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
records.clear();
updateCount.set(0);
}
+
+public static String dump() {
+return records.toString();
+}
}
}
-
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: Additional logging to help debug CI failure
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 92fd912 Additional logging to help debug CI failure
92fd912 is described below
commit 92fd91226eb4e782e79a9e8d33bfffea711a8626
Author: Mark Thomas
AuthorDate: Wed Apr 15 12:03:04 2020 +0100
Additional logging to help debug CI failure
---
.../websocket/TestWsWebSocketContainerGetOpenSessions.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 5ff4684..8190d6c 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -193,11 +193,11 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
delayCount++;
}
-Assert.assertTrue(Tracker.checkRecord("client1", client1Count));
-Assert.assertTrue(Tracker.checkRecord("client2", client2Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client1",
client1Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client2",
client2Count));
// Note: need to strip leading '/' from path
-Assert.assertTrue(Tracker.checkRecord(server1.substring(1),
server1Count));
-Assert.assertTrue(Tracker.checkRecord(server2.substring(1),
server2Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server1.substring(1), server1Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server2.substring(1), server2Count));
sClient1Server1.close();
sClient1Server2.close();
@@ -384,5 +384,9 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
records.clear();
updateCount.set(0);
}
+
+public static String dump() {
+return records.toString();
+}
}
}
-
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: Additional logging to help debug CI failure
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 4cc93c0 Additional logging to help debug CI failure
4cc93c0 is described below
commit 4cc93c0ce6c0da6cb68289f0a83e94c533b408b3
Author: Mark Thomas
AuthorDate: Wed Apr 15 12:03:04 2020 +0100
Additional logging to help debug CI failure
---
.../websocket/TestWsWebSocketContainerGetOpenSessions.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index e9af34f..68a1698 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -193,11 +193,11 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
delayCount++;
}
-Assert.assertTrue(Tracker.checkRecord("client1", client1Count));
-Assert.assertTrue(Tracker.checkRecord("client2", client2Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client1",
client1Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client2",
client2Count));
// Note: need to strip leading '/' from path
-Assert.assertTrue(Tracker.checkRecord(server1.substring(1),
server1Count));
-Assert.assertTrue(Tracker.checkRecord(server2.substring(1),
server2Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server1.substring(1), server1Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server2.substring(1), server2Count));
sClient1Server1.close();
sClient1Server2.close();
@@ -384,5 +384,9 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
records.clear();
updateCount.set(0);
}
+
+public static String dump() {
+return records.toString();
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Additional logging to help debug CI failure
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 a35efa6 Additional logging to help debug CI failure
a35efa6 is described below
commit a35efa672d5f989eb12ac16ce59e943afa6cb144
Author: Mark Thomas
AuthorDate: Wed Apr 15 12:03:04 2020 +0100
Additional logging to help debug CI failure
---
.../websocket/TestWsWebSocketContainerGetOpenSessions.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 97f88ef..3ddd00f 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -193,11 +193,11 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
delayCount++;
}
-Assert.assertTrue(Tracker.checkRecord("client1", client1Count));
-Assert.assertTrue(Tracker.checkRecord("client2", client2Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client1",
client1Count));
+Assert.assertTrue(Tracker.dump(), Tracker.checkRecord("client2",
client2Count));
// Note: need to strip leading '/' from path
-Assert.assertTrue(Tracker.checkRecord(server1.substring(1),
server1Count));
-Assert.assertTrue(Tracker.checkRecord(server2.substring(1),
server2Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server1.substring(1), server1Count));
+Assert.assertTrue(Tracker.dump(),
Tracker.checkRecord(server2.substring(1), server2Count));
sClient1Server1.close();
sClient1Server2.close();
@@ -384,5 +384,9 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
records.clear();
updateCount.set(0);
}
+
+public static String dump() {
+return records.toString();
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64317] org.apache.tomcat.util.net.TestSsl testPost() test failing on Windows
https://bz.apache.org/bugzilla/show_bug.cgi?id=64317 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #12 from Mark Thomas --- I ran the test 20 times on Windows with Java 8 (Adopt OpenJDK 242 64-bit) and didn't see a single error. Once I dropped the connection timeout to 1500ms I started to see errors similar to those reported here. I've increased the default timeout on this test to 20s so this should be fixed. -- 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-jakartaee-migration] ebourg commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException
ebourg commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException URL: https://github.com/apache/tomcat-jakartaee-migration/issues/3#issuecomment-613938070 Also `bcprov*.jar` could be excluded by default. 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 With regards, Apache Git Services - 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/169 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] 3b3c34d572ba1f61bdf10d444f5cd6efabd7e9f4 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
[GitHub] [tomcat-jakartaee-migration] ebourg commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException
ebourg commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException URL: https://github.com/apache/tomcat-jakartaee-migration/issues/3#issuecomment-613937324 > Trying to do too much would lead to more problems, here a likely excessive memory use. What is an excessive memory usage? A typical jar easily fits in the heap allocated by default to the JVM. This tool is mainly used at build time on beefy machines, I don't think the memory usage is really a concern. > How about adding a command line option to exclude certain JAR files from getting migrated? Good idea, something like an `--exclude` option with a glob parameter that could be repeated many times. 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] rmaucher commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException
rmaucher commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException URL: https://github.com/apache/tomcat-jakartaee-migration/issues/3#issuecomment-613924051 Yes, a resource filtering pattern or some kind could be a good add with plenty of uses. Still copy out and in should work and would likely be easier for you to do with your JCE JAR. 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 With regards, Apache Git Services - 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 typo
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 a88690d Fix typo
a88690d is described below
commit a88690da4f71ac788fb996e23ab3297476538c8b
Author: Mark Thomas
AuthorDate: Wed Apr 15 10:08:39 2020 +0100
Fix typo
---
.../tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 6b89035..e9af34f 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*
* Each test uses 2 client endpoint and 2 server endpoints with each client
* connecting to each server for a total of four connections (note sometimes
- * the two clients and/or the two servers will be the sam)e.
+ * the two clients and/or the two servers will be the same).
*/
public class TestWsWebSocketContainerGetOpenSessions extends WebSocketBaseTest
{
-
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 typo
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 cbed07b Fix typo
cbed07b is described below
commit cbed07b102035b79554ca3e81ecd4d9a40708d04
Author: Mark Thomas
AuthorDate: Wed Apr 15 10:08:39 2020 +0100
Fix typo
---
.../tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 8c740f1..5ff4684 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*
* Each test uses 2 client endpoint and 2 server endpoints with each client
* connecting to each server for a total of four connections (note sometimes
- * the two clients and/or the two servers will be the sam)e.
+ * the two clients and/or the two servers will be the same).
*/
public class TestWsWebSocketContainerGetOpenSessions extends WebSocketBaseTest
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix typo
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 f3c598f Fix typo
f3c598f is described below
commit f3c598f0e6243efd85920b5a9630794d15ce2e6c
Author: Mark Thomas
AuthorDate: Wed Apr 15 10:08:39 2020 +0100
Fix typo
---
.../tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 91d730a..97f88ef 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*
* Each test uses 2 client endpoint and 2 server endpoints with each client
* connecting to each server for a total of four connections (note sometimes
- * the two clients and/or the two servers will be the sam)e.
+ * the two clients and/or the two servers will be the same).
*/
public class TestWsWebSocketContainerGetOpenSessions extends WebSocketBaseTest
{
-
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 typo
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 3b3c34d Fix typo
3b3c34d is described below
commit 3b3c34d572ba1f61bdf10d444f5cd6efabd7e9f4
Author: Mark Thomas
AuthorDate: Wed Apr 15 10:08:39 2020 +0100
Fix typo
---
.../tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 8c740f1..5ff4684 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*
* Each test uses 2 client endpoint and 2 server endpoints with each client
* connecting to each server for a total of four connections (note sometimes
- * the two clients and/or the two servers will be the sam)e.
+ * the two clients and/or the two servers will be the same).
*/
public class TestWsWebSocketContainerGetOpenSessions extends WebSocketBaseTest
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix IDE nag
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 a5498ac Fix IDE nag
a5498ac is described below
commit a5498ac591ba0654646d86ea329c8c4048854bf4
Author: Mark Thomas
AuthorDate: Wed Apr 15 10:07:30 2020 +0100
Fix IDE nag
---
test/org/apache/catalina/startup/EmbeddedTomcat.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/org/apache/catalina/startup/EmbeddedTomcat.java
b/test/org/apache/catalina/startup/EmbeddedTomcat.java
index 4f2c46d..869b707 100644
--- a/test/org/apache/catalina/startup/EmbeddedTomcat.java
+++ b/test/org/apache/catalina/startup/EmbeddedTomcat.java
@@ -79,6 +79,8 @@ public class EmbeddedTomcat {
private static class CounterServlet extends HttpServlet {
+private static final long serialVersionUID = 1L;
+
private AtomicInteger callCount = new AtomicInteger(0);
@Override
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] smarkwal commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException
smarkwal commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException URL: https://github.com/apache/tomcat-jakartaee-migration/issues/3#issuecomment-613915909 How about adding a command line option to exclude certain JAR files from getting migrated? It adds just a little bit of complexity in how to use the tool, but it has no impact on memory usage. And it is maybe useful in other scenarios as well. 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62920] Maven Plugin For Tomcat 9.0.x
https://bz.apache.org/bugzilla/show_bug.cgi?id=62920 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |MOVED --- Comment #4 from Mark Thomas --- And the issue tracker for the Tomcat Maven plugin is in Jira: https://issues.apache.org/jira/projects/MTOMCAT -- 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 62920] Maven Plugin For Tomcat 9.0.x
https://bz.apache.org/bugzilla/show_bug.cgi?id=62920 --- Comment #3 from mgrigorov --- The source code of the Maven plugin is at https://svn.apache.org/repos/asf/tomcat/maven-plugin/ -- 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
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/168 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] 293406cd045bbd62b48fd2769e498aac8df1bb7a 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 64317] org.apache.tomcat.util.net.TestSsl testPost() test failing on Windows
https://bz.apache.org/bugzilla/show_bug.cgi?id=64317 --- Comment #11 from Mark Thomas --- I'm wondering if this is a load issue. The test had a fairly low timeout on the server (3s) and I can imagine a situation where that timeout might get triggered if the host machine was under load. I've increased the timeout and I'll run some tests locally. -- 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 8.5.x updated: Attempt to address intermittent CI failures on Gump
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 7756b51 Attempt to address intermittent CI failures on Gump
7756b51 is described below
commit 7756b512d5f8bc2625f4353902b38215ed0b12f6
Author: Mark Thomas
AuthorDate: Wed Apr 15 08:56:56 2020 +0100
Attempt to address intermittent CI failures on Gump
---
test/org/apache/tomcat/util/net/TestSsl.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index f5ae28b..c594c09 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -86,6 +86,8 @@ public class TestSsl extends TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
TesterSupport.initSsl(tomcat);
+// Increase timeout as default (3s) can be too low for some CI systems
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout",
"2"));
Context ctxt = tomcat.addContext("", null);
Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Attempt to address intermittent CI failures on Gump
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 1350098 Attempt to address intermittent CI failures on Gump
1350098 is described below
commit 13500985d610d2e067e927c6fb1f464e08407afa
Author: Mark Thomas
AuthorDate: Wed Apr 15 08:56:56 2020 +0100
Attempt to address intermittent CI failures on Gump
---
test/org/apache/tomcat/util/net/TestSsl.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index f4d2c27..bb4c4eb 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -87,6 +87,8 @@ public class TestSsl extends TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
TesterSupport.initSsl(tomcat);
+// Increase timeout as default (3s) can be too low for some CI systems
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout",
"2"));
Context ctxt = tomcat.addContext("", null);
Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
-
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: Attempt to address intermittent CI failures on Gump
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 293406c Attempt to address intermittent CI failures on Gump
293406c is described below
commit 293406cd045bbd62b48fd2769e498aac8df1bb7a
Author: Mark Thomas
AuthorDate: Wed Apr 15 08:56:56 2020 +0100
Attempt to address intermittent CI failures on Gump
---
test/org/apache/tomcat/util/net/TestSsl.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index f55a794..0507231 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -86,6 +86,8 @@ public class TestSsl extends TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
TesterSupport.initSsl(tomcat);
+// Increase timeout as default (3s) can be too low for some CI systems
+
Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout",
"2"));
Context ctxt = tomcat.addContext("", null);
Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] rmaucher commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException
rmaucher commented on issue #3: Bug: Removing signature from JAR file with JCE providers leads to SecurityException URL: https://github.com/apache/tomcat-jakartaee-migration/issues/3#issuecomment-613880074 I think users should probably use scripting to exclude problem JARs from the migration. Trying to do too much would lead to more problems, here a likely excessive memory use [there is the same problem with SB which wants some uncompressed JARs, also not doable without full load in memory]. This tool is IMO better if it stays simple. 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62920] Maven Plugin For Tomcat 9.0.x
https://bz.apache.org/bugzilla/show_bug.cgi?id=62920 --- Comment #2 from Nicolò Boschi --- I'd like to work on that, could someone tell me where the changes need to be made? This is my first issue on tomcat -- 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
