Author: markt
Date: Mon Jan 7 15:52:13 2013
New Revision: 1429858
URL: http://svn.apache.org/viewvc?rev=1429858&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54371
Prevent exceptions when processing web fragments for unexpanded WAR files when
the context path contains characters that need to be encoded in URLs such as
spaces.
Patch provided by Polina Genova.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=1429858&r1=1429857&r2=1429858&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
Mon Jan 7 15:52:13 2013
@@ -444,6 +444,7 @@ public class DirContextURLConnection ext
int start;
if (context instanceof ProxyDirContext) {
String cp = ((ProxyDirContext)context).getContextPath();
+ cp = URL_ENCODER.encodeURL(cp);
String h = ((ProxyDirContext)context).getHostName();
if ("".equals(cp)) {
start = h.length() + 2;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1429858&r1=1429857&r2=1429858&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 7 15:52:13 2013
@@ -92,6 +92,12 @@
(where supported by the connector) between the HTTP upgrade and the
first WebSocket message from the client to the server. (markt)
</add>
+ <fix>
+ <bug>54371</bug>: Prevent exceptions when processing web fragments for
+ unexpanded WAR files when the context path contains characters that
+ need to be encoded in URLs such as spaces. Patch provided by Polina
+ Genova. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
