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 2013/06/13 00:12:51 UTC
svn commit: r1492451 -
/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Author: markt
Date: Wed Jun 12 22:12:51 2013
New Revision: 1492451
URL: http://svn.apache.org/r1492451
Log:
r1491962 broke HTTP upgrade on some platforms (including the CI). Ensure that HTTP upgrade responses are flushed as the normal code path for this is bypassed when using HTTP upgrade.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1492451&r1=1492450&r2=1492451&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Wed Jun 12 22:12:51 2013
@@ -24,6 +24,7 @@ import java.security.PrivilegedException
import java.util.HashMap;
import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Globals;
import org.apache.coyote.ActionCode;
@@ -284,7 +285,12 @@ public class OutputBuffer extends Writer
}
}
- doFlush(false);
+ if (coyoteResponse.getStatus() ==
+ HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
+ doFlush(true);
+ } else {
+ doFlush(false);
+ }
closed = true;
// The request should have been completely read by the time the response
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org