Refactor the expectation flag to move it to the request (since it is …

…a property of the request)

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

java/org/apache/coyote/Request.java

@@ -121,6 +121,10 @@ public Request() {
     private long contentLength = -1;
     private MessageBytes contentTypeMB = null;
     private String charEncoding = null;
+    /**
+     * Is there an expectation ?
+     */
+    private boolean expectation = false;
 
     private final ServerCookies serverCookies = new ServerCookies(INITIAL_COOKIE_SIZE);
     private final Parameters parameters = new Parameters();
@@ -344,6 +348,17 @@ public String getHeader(String name) {
         return headers.getHeader(name);
     }
 
+
+    public void setExpectation(boolean expectation) {
+        this.expectation = expectation;
+    }
+
+
+    public boolean hasExpectation() {
+        return expectation;
+    }
+
+
     // -------------------- Associated response --------------------
 
     public Response getResponse() {
@@ -524,6 +539,7 @@ public void recycle() {
         contentLength = -1;
         contentTypeMB = null;
         charEncoding = null;
+        expectation = false;
         headers.recycle();
         serverNameMB.recycle();
         serverPort=-1;

java/org/apache/coyote/http11/Http11Processor.java

@@ -151,12 +151,6 @@ public class Http11Processor extends AbstractProcessor {
     protected boolean contentDelimitation = true;
 
 
-    /**
-     * Is there an expectation ?
-     */
-    protected boolean expectation = false;
-
-
     /**
      * Regular expression that defines the restricted user agents.
      */
@@ -678,15 +672,13 @@ public final void action(ActionCode actionCode, Object param) {
             // Acknowledge request
             // Send a 100 status back if it makes sense (response not committed
             // yet, and client specified an expectation for 100-continue)
-            if ((response.isCommitted()) || !expectation) {
-                return;
-            }
-
-            inputBuffer.setSwallowInput(true);
-            try {
-                outputBuffer.sendAck();
-            } catch (IOException e) {
-                setErrorState(ErrorState.CLOSE_NOW, e);
+            if (!response.isCommitted() && request.hasExpectation()) {
+                inputBuffer.setSwallowInput(true);
+                try {
+                    outputBuffer.sendAck();
+                } catch (IOException e) {
+                    setErrorState(ErrorState.CLOSE_NOW, e);
+                }
             }
             break;
         }
@@ -1227,7 +1219,8 @@ private boolean handleIncompleteRequestLineRead() {
 
 
     private void checkExpectationAndResponseStatus() {
-        if (expectation && (response.getStatus() < 200 || response.getStatus() > 299)) {
+        if (request.hasExpectation() &&
+                (response.getStatus() < 200 || response.getStatus() > 299)) {
             // Client sent Expect: 100-continue but received a
             // non-2xx final response. Disable keep-alive (if enabled)
             // to ensure that the connection is closed. Some clients may
@@ -1248,7 +1241,6 @@ private void prepareRequest() {
         http11 = true;
         http09 = false;
         contentDelimitation = false;
-        expectation = false;
         sendfileData = null;
 
         if (endpoint.isSSLEnabled()) {
@@ -1307,7 +1299,7 @@ private void prepareRequest() {
         if (expectMB != null) {
             if (expectMB.indexOfIgnoreCase("100-continue", 0) != -1) {
                 inputBuffer.setSwallowInput(false);
-                expectation = true;
+                request.setExpectation(true);
             } else {
                 response.setStatus(HttpServletResponse.SC_EXPECTATION_FAILED);
                 setErrorState(ErrorState.CLOSE_CLEAN, null);