Author: kkolinko
Date: Fri Mar 30 20:33:27 2012
New Revision: 1307600
URL: http://svn.apache.org/viewvc?rev=1307600&view=rev
Log:
Merged revision 1307597 from tomcat/trunk:
Followup to https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
Remove wrong call. The tests pass for me with this call being removed.
If allowLinking feature is really needed, it should be configured explicitly.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1307597
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=1307600&r1=1307599&r2=1307600&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 Mar 30 20:33:27 2012
@@ -114,9 +114,6 @@ public class VirtualDirContext extends F
mappedResourcePaths.put(path, resourcePaths);
}
resourcePaths.add(dir);
-
- // Set allowLinking since there can be no canonical path
- setAllowLinking(true);
}
}
if (mappedResourcePaths.isEmpty()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
