Connector alignment - this parameter is ignored with BIO

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1165723 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index e4e32cc..e2637f2 100644 (file)
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -208,7 +208,13 @@ public class Http11AprProcessor extends AbstractHttp11Processor<Long> {
                         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();

diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index be8114f..11b3050 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -235,7 +235,13 @@ public class Http11NioProcessor extends AbstractHttp11Processor<NioChannel> {
                         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() ) {

diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index 91e40aa..98c6051 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -165,7 +165,7 @@ public class Http11Processor extends AbstractHttp11Processor<Socket> {
             try {
                 setRequestLineReadTimeout();
                 
-                if (!inputBuffer.parseRequestLine(false)) {
+                if (!inputBuffer.parseRequestLine(keptAlive)) {
                     if (handleIncompleteRequestLineRead()) {
                         break;
                     }