(tomcat) branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c0cb9b3b00 Update comment
c0cb9b3b00 is described below
commit c0cb9b3b008b4729661118fc6146e0521976e4da
Author: Mark Thomas
AuthorDate: Fri Mar 15 19:09:54 2024 +
Update comment
---
test/org/apache/catalina/core/TestAsyncContextImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index db6289e79f..c22321e803 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -376,7 +376,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
// may be recycled at any point. Normally
// there is enough time for this call to
// complete but not always. If this call
-// fails in Tomcat an NPE will result so
+// fails in Tomcat an ISE will result so
// handle this here with a hack. What we
are
// really checking here is that it does not
// return true.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ca06a33bd4 Update comment
ca06a33bd4 is described below
commit ca06a33bd42af8f0d384802b61be83cbfd48ccc2
Author: Mark Thomas
AuthorDate: Thu Jul 27 15:48:59 2023 +0100
Update comment
---
java/org/apache/coyote/http2/Stream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 1a4ab09743..7fa900aced 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -896,7 +896,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
private volatile boolean endOfStreamSent = false;
/*
- * The write methods are synchronized to ensure that only one thread
at a time is able to access the buffer.
+ * The write methods share a common lock to ensure that only one
thread at a time is able to access the buffer.
* Without this protection, a client that performed concurrent writes
could corrupt the buffer.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new efea9d2641 Update comment
efea9d2641 is described below
commit efea9d264140ddc7fdcbe5c88060d4f65169b8d2
Author: Mark Thomas
AuthorDate: Wed Jul 26 17:19:22 2023 +0100
Update comment
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index d890945452..73ddc28f3f 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1338,9 +1338,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
Stream pushStream;
-// Synchronized since PUSH_PROMISE frames have to be sent in order.
Once
-// the stream has been created we need to ensure that the PUSH_PROMISE
-// is sent before the next stream is created for a PUSH_PROMISE.
+/*
+ * Uses SocketWrapper lock since PUSH_PROMISE frames have to be sent
in order. Once the stream has been created
+ * we need to ensure that the PUSH_PROMISE is sent before the next
stream is created for a PUSH_PROMISE.
+ */
Lock lock = socketWrapper.getLock();
lock.lock();
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 6de806a21a Update comment
6de806a21a is described below
commit 6de806a21adc68a23aa4043c67c0d80bbab1c458
Author: Mark Thomas
AuthorDate: Wed Mar 15 14:32:57 2023 +
Update comment
---
java/org/apache/catalina/connector/Connector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 40353b45cd..c9200e20ca 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -202,7 +202,7 @@ public class Connector extends LifecycleMBeanBase {
private int maxCookieCount = 200;
/**
- * The maximum number of parameters (GET plus POST) which will be
automatically parsed by the container. 1 by
+ * The maximum number of parameters (GET plus POST) which will be
automatically parsed by the container. 1000 by
* default. A value of less than 0 means no limit.
*/
protected int maxParameterCount = 1000;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3124e9798a Update comment
3124e9798a is described below
commit 3124e9798a272db2aff7cef33e50a639ebea5f3d
Author: remm
AuthorDate: Fri Dec 9 15:08:40 2022 +0100
Update comment
---
.../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 2 +-
.../java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 255c3765e1..1b73870194 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -1382,7 +1382,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
private ContextState(MemorySegment sslCtx, MemorySegment confCtx,
List negotiableProtocols) {
states.put(Long.valueOf(sslCtx.address()), this);
this.negotiableProtocols = negotiableProtocols;
-// Allocate another session to avoid keeping a reference through
segments
+// Use another arena to avoid keeping a reference through segments
// This also allows making further accesses to the main pointers
safer
this.sslCtx = MemorySegment.ofAddress(sslCtx.address(),
ValueLayout.ADDRESS.byteSize(), stateArena.scope());
if (!MemorySegment.NULL.equals(confCtx)) {
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 7ce5d6bd12..88ecc5822b 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -1813,7 +1813,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
states.put(Long.valueOf(ssl.address()), this);
this.certificateVerificationDepth = certificateVerificationDepth;
this.noOcspCheck = noOcspCheck;
-// Allocate another session to avoid keeping a reference through
segments
+// Use another arena to avoid keeping a reference through segments
// This also allows making further accesses to the main pointers
safer
this.ssl = MemorySegment.ofAddress(ssl.address(),
ValueLayout.ADDRESS.byteSize(), stateArena.scope());
this.networkBIO = MemorySegment.ofAddress(networkBIO.address(),
ValueLayout.ADDRESS.byteSize(), stateArena.scope());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment after testing with more recent Java version
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 880d53e Update comment after testing with more recent Java version
880d53e is described below
commit 880d53ebed6ecf30679b3fdb18e4db91645e61d4
Author: Mark Thomas
AuthorDate: Sat Aug 21 20:58:50 2021 +0100
Update comment after testing with more recent Java version
---
test/org/apache/catalina/connector/TestResponsePerformance.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/catalina/connector/TestResponsePerformance.java
b/test/org/apache/catalina/connector/TestResponsePerformance.java
index eb1236e..044fcfd 100644
--- a/test/org/apache/catalina/connector/TestResponsePerformance.java
+++ b/test/org/apache/catalina/connector/TestResponsePerformance.java
@@ -26,7 +26,7 @@ import org.apache.tomcat.unittest.TesterRequest;
public class TestResponsePerformance extends LoggingBaseTest {
-private static final int ITERATIONS = 10;
+private static final int ITERATIONS = 100;
@Test
public void testToAbsolutePerformance() throws Exception {
@@ -38,9 +38,8 @@ public class TestResponsePerformance extends LoggingBaseTest {
doHomebrew(resp);
doUri();
-// Note: Java 9 on my OSX laptop consistently shows doUri() is faster
-// than doHomebrew(). Worth a closer look for Tomcat 10 on the
-// assumption it will require java 9
+// Note: With Java 11 the 'homebrew' approach is consistently 3 to 4
+// times faster on both MacOS and Linux
// To allow for timing differences between runs, a "best of n" approach
// is taken for this test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8e8f634 Update comment
8e8f634 is described below
commit 8e8f634a3da96ff9fca3588bbd09aa833bb91ac2
Author: Mark Thomas
AuthorDate: Wed Jul 28 21:39:08 2021 +0100
Update comment
---
java/org/apache/catalina/loader/WebappLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index ed377cd..a50944c 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -586,7 +586,7 @@ public class WebappLoader extends LifecycleMBeanBase
implements Loader{
classpath.append(repository);
}
} else if (loader == ClassLoader.getSystemClassLoader()){
-// Java 9 onwards. The internal class loaders no longer extend
+// From Java 9 the internal class loaders no longer extend
// URLCLassLoader
String cp = System.getProperty("java.class.path");
if (cp != null && cp.length() > 0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 650a972 Update comment
650a972 is described below
commit 650a972f671f5edb34263237393438eca89204f4
Author: Mark Thomas
AuthorDate: Wed Jul 28 12:47:50 2021 +0100
Update comment
---
java/org/apache/tomcat/websocket/PerMessageDeflate.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
index 95ff848..a96da90 100644
--- a/java/org/apache/tomcat/websocket/PerMessageDeflate.java
+++ b/java/org/apache/tomcat/websocket/PerMessageDeflate.java
@@ -98,7 +98,7 @@ public class PerMessageDeflate implements Transformation {
SERVER_MAX_WINDOW_BITS,
Integer.valueOf(serverMaxWindowBits)));
}
-// Java SE API (as of Java 8) does not expose the API
to
+// Java SE API (as of Java 11) does not expose the API
to
// control the Window size. It is effectively
hard-coded
// to 15
if (isServer && serverMaxWindowBits != 15) {
@@ -119,7 +119,7 @@ public class PerMessageDeflate implements Transformation {
if (clientMaxWindowBits == -1) {
if (param.getValue() == null) {
// Hint to server that the client supports this
-// option. Java SE API (as of Java 8) does not
+// option. Java SE API (as of Java 11) does not
// expose the API to control the Window size. It is
// effectively hard-coded to 15
clientMaxWindowBits = 15;
@@ -132,7 +132,7 @@ public class PerMessageDeflate implements Transformation {
Integer.valueOf(clientMaxWindowBits)));
}
}
-// Java SE API (as of Java 8) does not expose the API
to
+// Java SE API (as of Java 11) does not expose the API
to
// control the Window size. It is effectively
hard-coded
// to 15
if (!isServer && clientMaxWindowBits != 15) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
