(tomcat) branch 9.0.x updated: Update comment
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 931998fdd1 Update comment
931998fdd1 is described below
commit 931998fdd1d80dd7d0b6406d11729f672a63d031
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 781ad73454..fe938dc155 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 9.0.x updated: Update comment
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 5e27393e76 Update comment
5e27393e76 is described below
commit 5e27393e76a7589438f287815391b4babb481f7e
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 ff920e7536..ec80af2707 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -937,7 +937,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 9.0.x updated: Update comment
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 4db92d45e4 Update comment
4db92d45e4 is described below
commit 4db92d45e445cb8b35869f42d8638419b2d71c93
Author: Mark Thomas
AuthorDate: Wed Jul 26 17:19:22 2023 +0100
Update comment
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index e653611498..0a8aa8c5d2 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
import javax.servlet.http.WebConnection;
@@ -1331,16 +1332,18 @@ 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.
-socketWrapper.getLock().lock();
+/*
+ * 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 {
pushStream = createLocalStream(request);
writeHeaders(associatedStream, pushStream.getIdAsInt(),
request.getMimeHeaders(), false,
Constants.DEFAULT_HEADERS_FRAME_SIZE);
} finally {
-socketWrapper.getLock().unlock();
+lock.unlock();
}
pushStream.sentPushPromise();
-
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: Update comment
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 c79a3f5f8c Update comment
c79a3f5f8c is described below
commit c79a3f5f8c3ae3dd7cac3f430219d5f5533af926
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 2d2d09560e..833b5a33a9 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -195,7 +195,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
