Author: markt
Date: Thu Oct 30 09:28:30 2014
New Revision: 1635440

URL: http://svn.apache.org/r1635440
Log:
Update comment as a result of r1635431.
Fix some formatting nits spotted while reviewing r1635431

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1635440&r1=1635439&r2=1635440&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu 
Oct 30 09:28:30 2014
@@ -1275,7 +1275,7 @@ public abstract class AbstractHttp11Proc
         }
 
         // Check user-agent header
-        if ((restrictedUserAgents != null) && ((http11) || (keepAlive))) {
+        if (restrictedUserAgents != null && (http11 || keepAlive)) {
             MessageBytes userAgentValueMB = headers.getValue("user-agent");
             // Check in the restricted list, and adjust the http11
             // and keepAlive flags accordingly
@@ -1313,7 +1313,6 @@ public abstract class AbstractHttp11Proc
                 hostMB.setBytes(uriB, uriBCStart + pos + 3,
                                 slashPos - pos - 3);
             }
-
         }
 
         // Input filter setup
@@ -1476,7 +1475,8 @@ public abstract class AbstractHttp11Proc
             contentDelimitation = true;
         } else {
             // If the response code supports an entity body and we're on
-            // HTTP 1.1 then we chunk unless we have a Connection: close header
+            // HTTP 1.1 and we are using keep-alive then we chunk unless we 
have
+            // a Connection: close header
             connectionClosePresent = isConnectionClose(headers);
             if (entityBody && http11 && keepAlive && !connectionClosePresent) {
                 getOutputBuffer().addActiveFilter



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to