Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 37019D6CE for ; Tue, 28 May 2013 11:42:22 +0000 (UTC) Received: (qmail 4692 invoked by uid 500); 28 May 2013 11:42:20 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 4610 invoked by uid 500); 28 May 2013 11:42:20 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 4601 invoked by uid 99); 28 May 2013 11:42:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 11:42:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 11:42:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 80D392388900 for ; Tue, 28 May 2013 11:41:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1486884 - in /tomcat/trunk: java/org/apache/coyote/spdy/SpdyProxyProtocol.java webapps/docs/changelog.xml Date: Tue, 28 May 2013 11:41:57 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130528114157.80D392388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + + Experimental support for SDPY. Includes contributions from Sheldon Shao. + (costin) + The default connector is now the Java NIO connector even when specifying HTTP/1.1 as protocol (fhanik) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org