Author: markt
Date: Thu Aug 22 21:28:43 2013
New Revision: 1516616
URL: http://svn.apache.org/r1516616
Log:
Ensure that HTTP upgrade responses are flushed as the normal code path for this
is bypassed when using HTTP upgrade.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1516616&r1=1516615&r2=1516616&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Thu Aug 22 21:28:43 2013
@@ -24,6 +24,8 @@ import java.security.PrivilegedActionExc
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.catalina.Globals;
import org.apache.coyote.ActionCode;
import org.apache.coyote.Response;
@@ -300,7 +302,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
