Author: markt
Date: Tue May 28 11:41:57 2013
New Revision: 1486884
URL: http://svn.apache.org/r1486884
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54961
Make "compress" configurable in SpdyProxyProtocol.
Patch by Sheldon Shao
Modified:
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java?rev=1486884&r1=1486883&r2=1486884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java Tue May 28
11:41:57 2013
@@ -55,6 +55,8 @@ public class SpdyProxyProtocol extends A
private final JIoEndpoint.Handler cHandler = new TomcatJioHandler();
private SpdyContext spdyContext;
+ private boolean compress = false;
+
public SpdyProxyProtocol() {
endpoint = new JIoEndpoint();
((JIoEndpoint) endpoint).setHandler(cHandler);
@@ -87,7 +89,7 @@ public class SpdyProxyProtocol extends A
public void start() throws Exception {
super.start();
spdyContext = new SpdyContext();
- spdyContext.setTlsComprression(false, false);
+ spdyContext.setTlsComprression(false, compress);
spdyContext.setHandler(new SpdyHandler() {
@Override
public void onStream(SpdyConnection con, SpdyStream ch) throws
IOException {
@@ -100,6 +102,14 @@ public class SpdyProxyProtocol extends A
spdyContext.setExecutor(endpoint.getExecutor());
}
+ public boolean isCompress() {
+ return compress;
+ }
+
+ public void setCompress(boolean compress) {
+ this.compress = compress;
+ }
+
public class TomcatJioHandler implements JIoEndpoint.Handler {
@Override
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1486884&r1=1486883&r2=1486884&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 28 11:41:57 2013
@@ -131,6 +131,10 @@
</subsection>
<subsection name="Coyote">
<changelog>
+ <add>
+ Experimental support for SDPY. Includes contributions from Sheldon
Shao.
+ (costin)
+ </add>
<scode>
The default connector is now the Java NIO connector even when
specifying
HTTP/1.1 as protocol (fhanik)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
