Author: markt
Date: Thu Dec 11 23:04:51 2014
New Revision: 1644784
URL: http://svn.apache.org/r1644784
Log:
A little refactoring in preparation for some RewriteValve fixes. No functional
change.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1644784&r1=1644783&r2=1644784&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Dec
11 23:04:51 2014
@@ -582,8 +582,10 @@ public class CoyoteAdapter implements Ad
req.serverName().setString(proxyName);
}
+ MessageBytes undecodedURI = req.requestURI();
+
// Check for ping OPTIONS * request
- if (req.requestURI().equals("*")) {
+ if (undecodedURI.equals("*")) {
if (req.method().equalsIgnoreCase("OPTIONS")) {
StringBuilder allow = new StringBuilder();
allow.append("GET, HEAD, POST, PUT, DELETE");
@@ -605,9 +607,9 @@ public class CoyoteAdapter implements Ad
// Copy the raw URI to the decodedURI
MessageBytes decodedURI = req.decodedURI();
- decodedURI.duplicate(req.requestURI());
+ decodedURI.duplicate(undecodedURI);
- if (decodedURI.getType() == MessageBytes.T_BYTES) {
+ if (undecodedURI.getType() == MessageBytes.T_BYTES) {
// Parse the path parameters. This will:
// - strip out the path parameters
// - convert the decodedURI to bytes
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
