Author: markt
Date: Tue Sep 6 15:49:43 2011
New Revision: 1165723
URL: http://svn.apache.org/viewvc?rev=1165723&view=rev
Log:
Connector alignment - this parameter is ignored with BIO
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1165723&r1=1165722&r2=1165723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Sep
6 15:49:43 2011
@@ -208,7 +208,13 @@ public class Http11AprProcessor extends
break;
}
}
- if (!endpoint.isPaused()) {
+
+ if (endpoint.isPaused()) {
+ // 503 - Service unavailable
+ response.setStatus(503);
+ adapter.log(request, response, 0);
+ error = true;
+ } else {
request.setStartTime(System.currentTimeMillis());
keptAlive = true;
inputBuffer.parseHeaders();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1165723&r1=1165722&r2=1165723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Sep
6 15:49:43 2011
@@ -235,7 +235,13 @@ public class Http11NioProcessor extends
break;
}
}
- if (!endpoint.isPaused()) {
+
+ if (endpoint.isPaused()) {
+ // 503 - Service unavailable
+ response.setStatus(503);
+ adapter.log(request, response, 0);
+ error = true;
+ } else {
request.setStartTime(System.currentTimeMillis());
keptAlive = true;
if ( !inputBuffer.parseHeaders() ) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1165723&r1=1165722&r2=1165723&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 6
15:49:43 2011
@@ -165,7 +165,7 @@ public class Http11Processor extends Abs
try {
setRequestLineReadTimeout();
- if (!inputBuffer.parseRequestLine(false)) {
+ if (!inputBuffer.parseRequestLine(keptAlive)) {
if (handleIncompleteRequestLineRead()) {
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
