Author: markt
Date: Fri Aug 12 07:46:17 2016
New Revision: 1756090
URL: http://svn.apache.org/viewvc?rev=1756090&view=rev
Log:
Align ActionCode.CloseNow
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1756090&r1=1756089&r2=1756090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Fri Aug 12
07:46:17 2016
@@ -408,7 +408,7 @@ public class AjpProcessor extends Abstra
}
case CLOSE_NOW: {
// Prevent further writes to the response
- swallowResponse = true;
+ setSwallowResponse();
setErrorState(ErrorState.CLOSE_NOW, null);
break;
}
@@ -1468,6 +1468,11 @@ public class AjpProcessor extends Abstra
}
+ private void setSwallowResponse() {
+ swallowResponse = true;
+ }
+
+
/**
* Read at least the specified amount of bytes, and place them
* in the input buffer. Note that if any data is available to read then
this
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=1756090&r1=1756089&r2=1756090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12
07:46:17 2016
@@ -700,8 +700,8 @@ public class Http11Processor extends Abs
break;
}
case CLOSE_NOW: {
- // Block further output
- outputBuffer.responseFinished = true;
+ // Prevent further writes to the response
+ setSwallowResponse();
setErrorState(ErrorState.CLOSE_NOW, null);
break;
}
@@ -1816,6 +1816,11 @@ public class Http11Processor extends Abs
}
+ private void setSwallowResponse() {
+ outputBuffer.responseFinished = true;
+ }
+
+
/**
* Checks to see if the keep-alive loop should be broken, performing any
* processing (e.g. sendfile handling) that may have an impact on whether
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756090&r1=1756089&r2=1756090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12
07:46:17 2016
@@ -154,10 +154,8 @@ public class StreamProcessor extends Abs
break;
}
case CLOSE_NOW: {
- // No need to block further output. This is called by the error
- // reporting valve if the response is already committed. It will
- // flush any remaining response data before this call.
- // Setting the error state will then cause this stream to be reset.
+ // Prevent further writes to the response
+ setSwallowResponse();
setErrorState(ErrorState.CLOSE_NOW, null);
break;
}
@@ -409,6 +407,11 @@ public class StreamProcessor extends Abs
}
+ private void setSwallowResponse() {
+ // NO-OP
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
