Author: remm
Date: Tue Jul 10 12:14:58 2018
New Revision: 1835543
URL: http://svn.apache.org/viewvc?rev=1835543&view=rev
Log:
62527: Revert restriction of JNDI to the java: namespace.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1835543&r1=1835542&r2=1835543&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
Tue Jul 10 12:14:58 2018
@@ -15,7 +15,6 @@
filterDef.invalidFilterName=Invalid <filter-name> [{0}] in filter definition.
-resourceBase.lookupNotJava=Lookup-name values must explicitly reference the
java: namespace but [{0}] does not
securityConstraint.uncoveredHttpMethod=For security constraints with URL
pattern [{0}] only the HTTP methods [{1}] are covered. All other methods are
uncovered.
securityConstraint.uncoveredHttpMethodFix=Adding security constraints with URL
pattern [{0}] to deny access with the uncovered HTTP methods that are not one
of the following [{1}]
securityConstraint.uncoveredHttpOmittedMethod=For security constraints with
URL pattern [{0}] the HTTP methods [{1}] are uncovered.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java?rev=1835543&r1=1835542&r2=1835543&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
Tue Jul 10 12:14:58 2018
@@ -91,15 +91,10 @@ public class ResourceBase implements Ser
}
public void setLookupName(String lookupName) {
- // EE.5.3.3: Must explicitly use java: namespace
if (lookupName == null || lookupName.length() == 0) {
this.lookupName = null;
return;
}
- if (!lookupName.startsWith("java:")) {
- throw new IllegalArgumentException(
- sm.getString("resourceBase.lookupNotJava", lookupName));
- }
this.lookupName = lookupName;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1835543&r1=1835542&r2=1835543&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 10 12:14:58 2018
@@ -66,6 +66,10 @@
filter and improve the cacheability of requests that pass through the
COPRS filter. (markt)
</fix>
+ <fix>
+ <bug>62527</bug>: Revert restriction of JNDI to the <code>java:</code>
+ namespace. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
