Author: markt
Date: Sun Jan 6 14:28:12 2008
New Revision: 609447
URL: http://svn.apache.org/viewvc?rev=609447&view=rev
Log:
Fix bug 43241. ervletContext.getResourceAsStream() not spec compliant. Patch
provided by John Kew.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java?rev=609447&r1=609446&r2=609447&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Sun Jan 6 14:28:12 2008
@@ -523,7 +523,7 @@
public InputStream getResourceAsStream(String path) {
path = normalize(path);
- if (path == null)
+ if (path == null || !path.startsWith("/"))
return (null);
DirContext resources = context.getResources();
@@ -884,7 +884,7 @@
String normalized = path;
- // Normalize the slashes and add leading slash if necessary
+ // Normalize the slashes
if (normalized.indexOf('\\') >= 0)
normalized = normalized.replace('\\', '/');
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=609447&r1=609446&r2=609447&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jan 6 14:28:12 2008
@@ -68,6 +68,10 @@
o.a.juli.ClassLoaderLogManager handle more then one system property
replacement at file logging.properties. (pero)
</fix>
<fix>
+ <bug>43241</bug>: ServletContext.getResourceAsStream() not spec
+ compliant. Patch provided by John Kew. (markt)
+ </fix>
+ <fix>
<bug>43675</bug>: Fix a possible logging related class loader leak.
(markt)
</fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609447&r1=609446&r2=609447&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jan 6 14:28:12 2008
@@ -47,12 +47,6 @@
-1:
0: fhanik, this needs to be reworked completely, so I'm neutral
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43241
- ServletContext.getResourceAsStream() not spec compliant
- http://svn.apache.org/viewvc?rev=605356&view=rev
- +1: markt, pero, fhanik
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43236
Reset usingWriter and associated flags when response is reset
http://svn.apache.org/viewvc?rev=605364&view=rev
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
