You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/10 21:54:56 UTC
svn commit: r1371816 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/naming/resources/VirtualDirContext.java
webapps/docs/changelog.xml
Author: markt
Date: Fri Aug 10 19:54:55 2012
New Revision: 1371816
URL: http://svn.apache.org/viewvc?rev=1371816&view=rev
Log:
Fix JAR scanning when WEB-INF/lib is provided via VirtualDirContext
Patch provided by Philip Zuev
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1371812
Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1371816&r1=1371815&r2=1371816&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java Fri Aug 10 19:54:55 2012
@@ -296,4 +296,13 @@ public class VirtualDirContext extends F
return retSuper;
}
+ @Override
+ protected String doGetRealPath(String path) {
+ File file = file(path);
+ if (null != file) {
+ return file.getAbsolutePath();
+ } else {
+ return null;
+ }
+ }
}
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=1371816&r1=1371815&r2=1371816&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Aug 10 19:54:55 2012
@@ -99,6 +99,10 @@
on Context start. Patch provided by Cedomir Igaly. (markt)
</fix>
<fix>
+ <bug>53541</bug>: Fix JAR scanning when WEB-INF/lib is provided via
+ VirtualDirContext. Patch provided by Philip Zuev. (markt)
+ </fix>
+ <fix>
<bug>53584</bug>: Ignore path parameters when comparing URIs for FORM
authentication. This prevents users being prompted twice for passwords
when logging in when session IDs are being encoded as path parameters.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org