Author: markt
Date: Tue May 12 20:45:36 2015
New Revision: 1679092
URL: http://svn.apache.org/r1679092
Log:
It was only a matter of time before I committed this by mistake. Revert it.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1679092&r1=1679091&r2=1679092&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue
May 12 20:45:36 2015
@@ -37,7 +37,6 @@ import org.apache.coyote.UpgradeProtocol
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
-import org.apache.coyote.http2.Http2Protocol;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -53,7 +52,7 @@ public abstract class AbstractHttp11Prot
// This is disabled by default otherwise it will break the
// APR/native connector with clients that support h2 with ALPN
// (because the Http2Protocol is only stubbed out)
- addUpgradeProtocol(new Http2Protocol());
+ //addUpgradeProtocol(new Http2Protocol());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
