Author: markt
Date: Thu Jun 12 17:46:59 2014
New Revision: 1602248
URL: http://svn.apache.org/r1602248
Log: (empty)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1598310-1598311
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1602248&r1=1602247&r2=1602248&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Thu Jun 12 17:46:59 2014
@@ -754,7 +754,6 @@ public abstract class AbstractHttp11Proc
switch (actionCode) {
case CLOSE: {
// End the processing of the current request
-
try {
getOutputBuffer().endRequest();
} catch (IOException e) {
@@ -765,7 +764,6 @@ public abstract class AbstractHttp11Proc
}
case COMMIT: {
// Commit current response
-
if (response.isCommitted()) {
return;
}
@@ -784,7 +782,6 @@ public abstract class AbstractHttp11Proc
// 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;
}
@@ -813,16 +810,14 @@ public abstract class AbstractHttp11Proc
break;
}
case DISABLE_SWALLOW_INPUT: {
- // Do not swallow request input but
- // make sure we are closing the connection
+ // Do not swallow request input and make sure we are closing the
+ // connection
error = true;
getInputBuffer().setSwallowInput(false);
break;
}
case RESET: {
- // Reset response
// Note: This must be called before the response is committed
-
getOutputBuffer().reset();
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
