You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/08/12 07:45:39 UTC
svn commit: r1756083 - in /tomcat/trunk/java/org/apache/coyote:
http11/Http11Processor.java http2/StreamProcessor.java
Author: markt
Date: Fri Aug 12 07:45:38 2016
New Revision: 1756083
URL: http://svn.apache.org/viewvc?rev=1756083&view=rev
Log:
Align ActionCode.COMMIT
Modified:
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/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756083&r1=1756082&r2=1756083&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:45:38 2016
@@ -655,7 +655,6 @@ public class Http11Processor extends Abs
try {
// Validate and write response headers
prepareResponse();
- outputBuffer.commit();
} catch (IOException e) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
}
@@ -1439,7 +1438,7 @@ public class Http11Processor extends Abs
* When committing the response, we have to validate the set of headers, as
* well as setup the response filters.
*/
- private void prepareResponse() {
+ private void prepareResponse() throws IOException {
boolean entityBody = true;
contentDelimitation = false;
@@ -1448,8 +1447,8 @@ public class Http11Processor extends Abs
if (http09 == true) {
// HTTP/0.9
- outputBuffer.addActiveFilter
- (outputFilters[Constants.IDENTITY_FILTER]);
+ outputBuffer.addActiveFilter(outputFilters[Constants.IDENTITY_FILTER]);
+ outputBuffer.commit();
return;
}
@@ -1603,6 +1602,7 @@ public class Http11Processor extends Abs
}
outputBuffer.endHeaders();
+ outputBuffer.commit();
}
private static boolean isConnectionClose(MimeHeaders headers) {
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=1756083&r1=1756082&r2=1756083&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:45:38 2016
@@ -107,8 +107,8 @@ public class StreamProcessor extends Abs
case COMMIT: {
if (!response.isCommitted()) {
try {
- response.setCommitted(true);
- stream.writeHeaders();
+ // Validate and write response headers
+ prepareResponse();
} catch (IOException ioe) {
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
}
@@ -379,6 +379,12 @@ public class StreamProcessor extends Abs
}
+ private void prepareResponse() throws IOException {
+ response.setCommitted(true);
+ stream.writeHeaders();
+ }
+
+
@Override
public void recycle() {
// StreamProcessor instances are not re-used.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org