[Bug 64710] NullPointerException in Http2UpgradeHandler.endRequestBodyFrame and BufferOverflowException in SocketBufferHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=64710 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Mark Thomas --- *** This bug has been marked as a duplicate of bug 64671 *** -- 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 64671] HTTP/2 Stream.receivedData method throwing continuous NullPointerException in the logs
https://bz.apache.org/bugzilla/show_bug.cgi?id=64671 Mark Thomas changed: What|Removed |Added CC||arshiya.shar...@ericsson.co ||m --- Comment #7 from Mark Thomas --- *** Bug 64710 has been marked as a duplicate of this bug. *** -- 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 master updated: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 17d9e68 Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
17d9e68 is described below
commit 17d9e688fab3b138d35c80c840763c4422e7dbfa
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the reques body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 6 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 40 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 553 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index c53f49c..ed2caf6 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ebd94f5..5e277fa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -50,6 +50,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1193,9 +1194,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
[tomcat] branch master updated: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 17d9e68 Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
17d9e68 is described below
commit 17d9e688fab3b138d35c80c840763c4422e7dbfa
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the reques body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 6 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 40 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 553 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index c53f49c..ed2caf6 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ebd94f5..5e277fa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -50,6 +50,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1193,9 +1194,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
[tomcat] branch master updated: Remove deprecated code
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 27166f8 Remove deprecated code
27166f8 is described below
commit 27166f8d43476840d51733244b7544de7d5ee43e
Author: Mark Thomas
AuthorDate: Sat Sep 5 17:02:12 2020 +0100
Remove deprecated code
---
java/org/apache/catalina/connector/Response.java | 14 --
java/org/apache/coyote/AbstractProcessor.java | 10 --
java/org/apache/coyote/http11/Http11Processor.java | 6 --
3 files changed, 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 5e277fa..c529d97 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1193,20 +1193,6 @@ public class Response implements HttpServletResponse {
/**
* Send an acknowledgement of a request.
*
- * @exception IOException if an input/output error occurs
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
- */
-@Deprecated
-public void sendAcknowledgement() throws IOException {
-sendAcknowledgement(ContinueResponseTiming.ALWAYS);
-}
-
-
-/**
- * Send an acknowledgement of a request.
- *
* @param continueResponseTiming Indicates when the request for the ACK
* originated so it can be compared with the
* configured timing for ACK responses.
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index f3b87ac..38e7f74 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -722,16 +722,6 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
protected abstract void finishResponse() throws IOException;
-/**
- * @deprecated Unused. This will be removed in Tomcat 10 onwards. Use
- * @{link {@link #ack(ContinueResponseTiming)}.
- */
-@Deprecated
-protected void ack() {
-ack(ContinueResponseTiming.ALWAYS);
-}
-
-
protected abstract void ack(ContinueResponseTiming continueResponseTiming);
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 37bb97b..a169cb4 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1160,12 +1160,6 @@ public class Http11Processor extends AbstractProcessor {
@Override
-protected final void ack() {
-ack(null);
-}
-
-
-@Override
protected final void ack(ContinueResponseTiming continueResponseTiming) {
// Only try and send the ACK for ALWAYS or if the timing of the request
// to send the ACK matches the current configuration.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 17d9e68 Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
17d9e68 is described below
commit 17d9e688fab3b138d35c80c840763c4422e7dbfa
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the reques body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 6 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 40 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 553 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index c53f49c..ed2caf6 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ebd94f5..5e277fa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -50,6 +50,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1193,9 +1194,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
[tomcat] branch master updated: Remove deprecated code
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 27166f8 Remove deprecated code
27166f8 is described below
commit 27166f8d43476840d51733244b7544de7d5ee43e
Author: Mark Thomas
AuthorDate: Sat Sep 5 17:02:12 2020 +0100
Remove deprecated code
---
java/org/apache/catalina/connector/Response.java | 14 --
java/org/apache/coyote/AbstractProcessor.java | 10 --
java/org/apache/coyote/http11/Http11Processor.java | 6 --
3 files changed, 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 5e277fa..c529d97 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1193,20 +1193,6 @@ public class Response implements HttpServletResponse {
/**
* Send an acknowledgement of a request.
*
- * @exception IOException if an input/output error occurs
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
- */
-@Deprecated
-public void sendAcknowledgement() throws IOException {
-sendAcknowledgement(ContinueResponseTiming.ALWAYS);
-}
-
-
-/**
- * Send an acknowledgement of a request.
- *
* @param continueResponseTiming Indicates when the request for the ACK
* originated so it can be compared with the
* configured timing for ACK responses.
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index f3b87ac..38e7f74 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -722,16 +722,6 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
protected abstract void finishResponse() throws IOException;
-/**
- * @deprecated Unused. This will be removed in Tomcat 10 onwards. Use
- * @{link {@link #ack(ContinueResponseTiming)}.
- */
-@Deprecated
-protected void ack() {
-ack(ContinueResponseTiming.ALWAYS);
-}
-
-
protected abstract void ack(ContinueResponseTiming continueResponseTiming);
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 37bb97b..a169cb4 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1160,12 +1160,6 @@ public class Http11Processor extends AbstractProcessor {
@Override
-protected final void ack() {
-ack(null);
-}
-
-
-@Override
protected final void ack(ContinueResponseTiming continueResponseTiming) {
// Only try and send the ACK for ALWAYS or if the timing of the request
// to send the ACK matches the current configuration.
-
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: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 edfd30e Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
edfd30e is described below
commit edfd30edb4c0f1bfcdd0820e492ad0c90b8b24b5
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the request body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 7 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 41 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 555 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 1d4257d..1dbe658 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ccd2e4c..0b772e8 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -51,6 +51,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1210,9 +1211,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
+
[tomcat] branch master updated: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 17d9e68 Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
17d9e68 is described below
commit 17d9e688fab3b138d35c80c840763c4422e7dbfa
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the reques body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 6 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 40 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 553 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index c53f49c..ed2caf6 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ebd94f5..5e277fa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -50,6 +50,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1193,9 +1194,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
[tomcat] branch master updated: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 17d9e68 Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
17d9e68 is described below
commit 17d9e688fab3b138d35c80c840763c4422e7dbfa
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the reques body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 6 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 40 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 553 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index c53f49c..ed2caf6 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ebd94f5..5e277fa 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -50,6 +50,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1193,9 +1194,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
[tomcat] branch 9.0.x updated: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 edfd30e Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
edfd30e is described below
commit edfd30edb4c0f1bfcdd0820e492ad0c90b8b24b5
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the request body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 7 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 41 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 555 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 1d4257d..1dbe658 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index ccd2e4c..0b772e8 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -51,6 +51,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1210,9 +1211,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
+
[tomcat] branch master updated: Remove deprecated code
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 27166f8 Remove deprecated code
27166f8 is described below
commit 27166f8d43476840d51733244b7544de7d5ee43e
Author: Mark Thomas
AuthorDate: Sat Sep 5 17:02:12 2020 +0100
Remove deprecated code
---
java/org/apache/catalina/connector/Response.java | 14 --
java/org/apache/coyote/AbstractProcessor.java | 10 --
java/org/apache/coyote/http11/Http11Processor.java | 6 --
3 files changed, 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 5e277fa..c529d97 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1193,20 +1193,6 @@ public class Response implements HttpServletResponse {
/**
* Send an acknowledgement of a request.
*
- * @exception IOException if an input/output error occurs
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
- */
-@Deprecated
-public void sendAcknowledgement() throws IOException {
-sendAcknowledgement(ContinueResponseTiming.ALWAYS);
-}
-
-
-/**
- * Send an acknowledgement of a request.
- *
* @param continueResponseTiming Indicates when the request for the ACK
* originated so it can be compared with the
* configured timing for ACK responses.
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index f3b87ac..38e7f74 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -722,16 +722,6 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
protected abstract void finishResponse() throws IOException;
-/**
- * @deprecated Unused. This will be removed in Tomcat 10 onwards. Use
- * @{link {@link #ack(ContinueResponseTiming)}.
- */
-@Deprecated
-protected void ack() {
-ack(ContinueResponseTiming.ALWAYS);
-}
-
-
protected abstract void ack(ContinueResponseTiming continueResponseTiming);
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 37bb97b..a169cb4 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1160,12 +1160,6 @@ public class Http11Processor extends AbstractProcessor {
@Override
-protected final void ack() {
-ack(null);
-}
-
-
-@Override
protected final void ack(ContinueResponseTiming continueResponseTiming) {
// Only try and send the ACK for ALWAYS or if the timing of the request
// to send the ACK matches the current configuration.
-
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: Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
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 32db2a6 Manually merge #332 - BZ 57661 - Vary when 100 response code
is sent
32db2a6 is described below
commit 32db2a6fa62a15a77682f6a193528f061e98235e
Author: Mark Thomas
AuthorDate: Sat Sep 5 16:57:42 2020 +0100
Manually merge #332 - BZ 57661 - Vary when 100 response code is sent
Allows the user to control when the 100 response is sent when the
request contains an expectation. Options are immediately (no change) or
on first read of the request body.
---
.../catalina/authenticator/FormAuthenticator.java | 5 +-
java/org/apache/catalina/connector/Response.java | 24 ++-
.../apache/catalina/core/StandardContextValve.java | 3 +-
java/org/apache/coyote/AbstractProcessor.java | 14 +-
java/org/apache/coyote/ContinueResponseTiming.java | 88 +++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Request.java| 4 +
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
.../coyote/http11/AbstractHttp11Protocol.java | 13 ++
.../apache/coyote/http11/Http11OutputBuffer.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 30 ++--
java/org/apache/coyote/http2/Http2Protocol.java| 6 +
java/org/apache/coyote/http2/StreamProcessor.java | 18 ++-
.../catalina/core/TestStandardContextValve.java| 77 ++
.../apache/catalina/startup/ExpectationClient.java | 51 +++
test/org/apache/coyote/TestRequest.java| 168 +
.../coyote/http11/TestHttp11OutputBuffer.java | 33 +---
.../apache/coyote/http2/TestHttp2Section_8_1.java | 41 -
webapps/docs/changelog.xml | 7 +
webapps/docs/config/http.xml | 15 ++
20 files changed, 554 insertions(+), 58 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 1d4257d..1dbe658 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -230,7 +231,7 @@ public class FormAuthenticator
// Yes -- Acknowledge the request, validate the specified credentials
// and redirect to the error page if they are not correct
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
Realm realm = context.getRealm();
if (characterEncoding != null) {
request.setCharacterEncoding(characterEncoding);
@@ -670,7 +671,7 @@ public class FormAuthenticator
}
// May need to acknowledge a 100-continue expectation
-request.getResponse().sendAcknowledgement();
+
request.getResponse().sendAcknowledgement(ContinueResponseTiming.ALWAYS);
int maxSavePostSize = request.getConnector().getMaxSavePostSize();
if (maxSavePostSize != 0) {
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 0140895..4cac2a9 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -47,6 +47,7 @@ import org.apache.catalina.Session;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContinueResponseTiming;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1205,9 +1206,26 @@ public class Response implements HttpServletResponse {
* Send an acknowledgement of a request.
*
* @exception IOException if an input/output error occurs
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
+ * Use {@link #sendAcknowledgement(ContinueResponseTiming)}.
*/
-public void sendAcknowledgement()
-throws IOException {
+@Deprecated
+public void sendAcknowledgement() throws IOException {
+sendAcknowledgement(ContinueResponseTiming.ALWAYS);
+}
+
+
+/**
+ * Send an acknowledgement of a request.
+ *
+ * @param continueResponseTiming Indicates when the request for the ACK
+ * originated so it can be compared with the
+
[Bug 57661] Delay sending of 100 continue response until application tries to read request body
https://bz.apache.org/bugzilla/show_bug.cgi?id=57661 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #14 from Mark Thomas --- Fixed in: - master for 10.0.0-M8 onwards - 9.0.x for 9.0.38 onwards - 8.5.x for 8.5.58 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #332: Support sending the 100 continue response when the servlet reads the …
markt-asf closed pull request #332: URL: https://github.com/apache/tomcat/pull/332 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #332: Support sending the 100 continue response when the servlet reads the …
markt-asf commented on pull request #332: URL: https://github.com/apache/tomcat/pull/332#issuecomment-687630947 Many thanks for the PR. This feature would not have been implemented without it. Applied to 10.0.x and back-ported to 9.0.x and 8.5.x. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #349: Optimize Server Startup time
markt-asf closed pull request #349: URL: https://github.com/apache/tomcat/pull/349 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #349: Optimize Server Startup time
markt-asf commented on pull request #349: URL: https://github.com/apache/tomcat/pull/349#issuecomment-687631167 Updated PR provided at #354 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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/406 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] edfd30edb4c0f1bfcdd0820e492ad0c90b8b24b5 Blamelist: Mark Thomas BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2439 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 32db2a6fa62a15a77682f6a193528f061e98235e Blamelist: Mark Thomas BUILD FAILED: failed compile Sincerely, -The Buildbot - 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 javadoc
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 5d40b63 Fix javadoc
5d40b63 is described below
commit 5d40b631f33bc35cb6307f41c073792e8f08c414
Author: Mark Thomas
AuthorDate: Sat Sep 5 17:25:43 2020 +0100
Fix javadoc
---
java/org/apache/coyote/AbstractProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index fbd3cd1..7255040 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -724,7 +724,7 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
/**
* @deprecated Unused. This will be removed in Tomcat 10 onwards. Use
- * @{link {@link #ack(ContinueResponseTiming)}.
+ * {@link #ack(ContinueResponseTiming)}.
*/
@Deprecated
protected void ack() {
-
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 javadoc
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 ba807bb Fix javadoc
ba807bb is described below
commit ba807bb7763ab80ce3b97df8c166b901116eaf15
Author: Mark Thomas
AuthorDate: Sat Sep 5 17:25:43 2020 +0100
Fix javadoc
---
java/org/apache/coyote/AbstractProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index b06a8da..6d66247 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -717,7 +717,7 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
/**
* @deprecated Unused. This will be removed in Tomcat 10 onwards. Use
- * @{link {@link #ack(ContinueResponseTiming)}.
+ * {@link #ack(ContinueResponseTiming)}.
*/
@Deprecated
protected void ack() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64712] javax.servlet.http.authType not evaluated after JASPIC authentication success
https://bz.apache.org/bugzilla/show_bug.cgi?id=64712 --- Comment #6 from Mark Thomas --- As far as Tomcat is concerned, this is an opaque value that is exposed via HttpServletRequest.getAuthType(). It should be fine to use the value provided by the ServerAuthModule. -- 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 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/407 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] 5d40b631f33bc35cb6307f41c073792e8f08c414 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2440 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] ba807bb7763ab80ce3b97df8c166b901116eaf15 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
[Bug 55937] Tomcat auto deployer not working for ROOT applications
https://bz.apache.org/bugzilla/show_bug.cgi?id=55937 --- Comment #6 from worejo7673 --- I would tag this as PatchAvailable, but I'm unclear what the attached patch seeks to accomplish, if it works as written, and why it's attached to this particular bug. https:/hexrom.com/ -- 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
