Author: markt
Date: Wed Nov 3 18:40:45 2010
New Revision: 1030603
URL: http://svn.apache.org/viewvc?rev=1030603&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49497
Stop accepting new requests (inc keep-alive) once the BIO connector is paused
and the current request has finished processing
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1030603&r1=1030602&r2=1030603&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 3 18:40:45 2010
@@ -102,13 +102,6 @@ PATCHES PROPOSED TO BACKPORT:
but from debugging it looks that it is called by Tomcat code only
(JspServlet).
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49497
- Stop accepting new requests (inc keep-alive) once the BIO connector is paused
- and the current request has finished processing
- https://issues.apache.org/bugzilla/attachment.cgi?id=26094
- +1: markt, kfujino, mturk
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49625
Ensure Vary header is set if response may be compressed rather than only
setting it if it is compressed.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1030603&r1=1030602&r2=1030603&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed
Nov 3 18:40:45 2010
@@ -799,7 +799,7 @@ public class Http11Processor implements
boolean keptAlive = false;
- while (started && !error && keepAlive) {
+ while (started && !error && keepAlive && !endpoint.isPaused()) {
// Parsing the request header
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
