Author: markt
Date: Thu Nov 26 14:01:40 2015
New Revision: 1716656
URL: http://svn.apache.org/viewvc?rev=1716656&view=rev
Log:
Implement a TODO. Trigger an exception if an HTTP upgrade is attempted over AJP.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1716656&r1=1716655&r2=1716656&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Thu Nov 26
14:01:40 2015
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.ajp;
+import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
@@ -171,8 +172,8 @@ public abstract class AbstractAjpProtoco
@Override
protected Processor createUpgradeProcessor(SocketWrapperBase<?> socket,
- ByteBuffer leftoverInput, UpgradeToken upgradeToken) {
- // TODO should fail - throw IOE
- return null;
+ ByteBuffer leftoverInput, UpgradeToken upgradeToken) throws
IOException {
+ throw new IOException(sm.getString("ajpprotocol.noUpgradeHandler",
+ upgradeToken.getHttpUpgradeHandler().getClass().getName()));
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1716656&r1=1716655&r2=1716656&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties Thu Nov 26
14:01:40 2015
@@ -14,6 +14,7 @@
# limitations under the License.
ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration
for [{0}] was ignored
ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol
configuration for [{0}] was ignored
+ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The
HttpUpgradeHandler [{0}] can not be processed
ajpnioprotocol.releaseStart=Iterating through our connections to release a
socket channel [{0}]
ajpnioprotocol.releaseEnd=Done iterating through our connections to release a
socket channel [{0}] released [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
