svn commit: r1573294 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/valves/SSLValve.java webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: kkolinko Date: Sun Mar 2 12:46:24 2014 New Revision: 1573294 URL: http://svn.apache.org/r1573294 Log: CTR: docs Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56093 Provide documentation for SSLValve. Backport of r1073184, r1568921 Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1073184,1568921 Merged /tomcat/tc7.0.x/trunk:r1568922 Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1573294&r1=1573293&r2=1573294&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java Sun Mar 2 12:46:24 2014 @@ -32,22 +32,35 @@ import org.apache.catalina.connector.Res import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -/* - * Valve to fill the SSL informations in the request - * mod_header is used to fill the headers and the valve - * will fill the parameters of the request. +/** + * When using mod_proxy_http, the client SSL information is not included in the + * protocol (unlike mod_jk and mod_proxy_ajp). To make the client SSL + * information available to Tomcat, some additional configuration is required. + * In httpd, mod_headers is used to add the SSL information as HTTP headers. In + * Tomcat, this valve is used to read the information from the HTTP headers and + * insert it into the request. + * + * Note: Ensure that the headers are always set by httpd for all requests to + * prevent a client spoofing SSL information by sending fake headers. + * * In httpd.conf add the following: - * + * + ** RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s" * RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s" * RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s" * RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s" - * - * - * @author Jean-Frederic Clere + * + * * + * In server.xml, configure this valve under the Engine element in server.xml: + * + *+ * + * */ - public class SSLValve extends ValveBase { private static final Log log = LogFactory.getLog(SSLValve.class); Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1573294&r1=1573293&r2=1573294&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 2 12:46:24 2014 @@ -44,6 +44,13 @@ General, Catalina, Coyote, Jasper, Cluster, Web applications, Other --> + + + +56093: Documentation for SSLValve. (markt/kkolinko) + + + Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml?rev=1573294&r1=1573293&r2=1573294&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Sun Mar 2 12:46:24 2014 @@ -964,7 +964,48 @@ + + + +When using mod_proxy_http, the client SSL information is not included in +the protocol (unlike mod_jk and mod_proxy_ajp). To make the client SSL +information available to Tomcat, some additional configuration is required. +In httpd, mod_headers is used to add the SSL information as HTTP headers. In +Tomcat, this valve is used to read the information from the HTTP headers and +insert it into the request. + +Note: Ensure that the headers are always set by httpd for all requests to +prevent a client spoofing SSL information by sending fake headers. + +To configure httpd to set the necessary headers, add the following: ++ * + * + RequestHeader set SSL_CLIENT_CERT "%{SSL_CLIENT_CERT}s" + RequestHeader set SSL_CIPHER "%{SSL_CIPHER}s" + RequestHeader set SSL_SESSION_ID "%{SSL_SESSION_ID}s" + RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s" + + + + + + +The SSL Valve supports the following configuration +attribute: + + + + +Java class name of the implementation to use. This MUST be set to +org.apache.catalina.valves.SSLValve.
svn commit: r1573295 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Sun Mar 2 12:56:34 2014
New Revision: 1573295
URL: http://svn.apache.org/r1573295
Log:
proposal
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1573295&r1=1573294&r2=1573295&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 2 12:56:34 2014
@@ -40,7 +40,7 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=56199
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56199
http://tomcat.markmail.org/thread/ydrqotnjkmdl6err
Restore validateXml option in Jasper.
Motivation: It is mentioned in documentation and some users complained on
@@ -51,6 +51,14 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
+* Don't log to standard out in SSLValve.
+ Simplify: s/new String("xxx")/"xxx"/
+ http://svn.apache.org/r1081118
+
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?r1=1041511&r2=1041510&pathrev=1041511
+ +1: kkolinko
+ -1:
+
+
PATCHES/ISSUES THAT ARE STALLED:
None
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1573321 - in /tomcat/trunk: java/org/apache/catalina/webresources/StandardRoot.java webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 2 15:56:34 2014
New Revision: 1573321
URL: http://svn.apache.org/r1573321
Log:
Avoid internal NullPointerExceptions if a resource is requested from outside
the web application root.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1573321&r1=1573320&r2=1573321&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Sun
Mar 2 15:56:34 2014
@@ -117,6 +117,9 @@ public class StandardRoot extends Lifecy
if (validate) {
path = validate(path);
}
+if (path == null) {
+return new String[] {};
+}
// Set because we don't want duplicates
// LinkedHashSet to retain the order. It is the order of the
@@ -140,6 +143,9 @@ public class StandardRoot extends Lifecy
@Override
public Set listWebAppPaths(String path) {
path = validate(path);
+if (path == null) {
+return null;
+}
// Set because we don't want duplicates
HashSet result = new HashSet<>();
@@ -159,6 +165,9 @@ public class StandardRoot extends Lifecy
@Override
public boolean mkdir(String path) {
path = validate(path);
+if (path == null) {
+return false;
+}
if (preResourceExists(path)) {
return false;
@@ -170,6 +179,9 @@ public class StandardRoot extends Lifecy
@Override
public boolean write(String path, InputStream is, boolean overwrite) {
path = validate(path);
+if (path == null) {
+return false;
+}
if (!overwrite && preResourceExists(path)) {
return false;
@@ -198,6 +210,9 @@ public class StandardRoot extends Lifecy
if (validate) {
path = validate(path);
}
+if (path == null) {
+return null;
+}
if (isCachingAllowed()) {
return cache.getResource(path, useClassLoaderResources);
@@ -280,6 +295,9 @@ public class StandardRoot extends Lifecy
private WebResource[] getResources(String path,
boolean useClassLoaderResources) {
path = validate(path);
+if (path == null) {
+return new WebResource[] {};
+}
ArrayList result = new ArrayList<>();
for (ArrayList list : allResources) {
@@ -309,6 +327,9 @@ public class StandardRoot extends Lifecy
if (validate) {
path = validate(path);
}
+if (path == null) {
+return new WebResource[] {};
+}
String[] resources = list(path, false);
WebResource[] result = new WebResource[resources.length];
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1573321&r1=1573320&r2=1573321&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 2 15:56:34 2014
@@ -74,6 +74,10 @@
elements and attributes supported by the Servlet version of the merged
file. (markt)
+
+Avoid internal NullPointerExceptions if a resource is
+requested from outside the web application root. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5543 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1573321 Blamelist: markt BUILD FAILED: exception compile upload_2 sincerely, -The Buildbot
svn commit: r1573323 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 2 16:04:13 2014
New Revision: 1573323
URL: http://svn.apache.org/r1573323
Log:
DBCP update
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1573323&r1=1573322&r2=1573323&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sun Mar 2 16:04:13 2014
@@ -156,7 +156,7 @@ tomcat-native.win.2=${base-tomcat.loc.2}
#commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
#commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
#commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-commons-dbcp.version=2.0-20140226.144600-202
+commons-dbcp.version=2.0-20140228.204604-213
commons-dbcp.home=${base.path}/commons-dbcp2-2.0-SNAPSHOT-src
commons-dbcp-src.loc.1=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
commons-dbcp-src.loc.2=https://repository.apache.org/content/repositories/snapshots/org/apache/commons/commons-dbcp2/2.0-SNAPSHOT/commons-dbcp2-${commons-dbcp.version}-src.tar.gz
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1573323&r1=1573322&r2=1573323&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 2 16:04:13 2014
@@ -172,7 +172,7 @@
Update Commons Pool 2 to 2.2. (markt)
-Update Commons DBCP 2 to snapshot 202 dated 26 Feb 2014. (markt)
+Update Commons DBCP 2 to snapshot 213 dated 28 Feb 2014. (markt)
56189: Remove used file cpappend.bat from the distribution.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1573331 - in /tomcat/trunk: java/org/apache/catalina/webresources/StandardRoot.java webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 2 16:35:35 2014
New Revision: 1573331
URL: http://svn.apache.org/r1573331
Log:
Revert r1573321 as it triggers unit test failures
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1573331&r1=1573330&r2=1573331&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Sun
Mar 2 16:35:35 2014
@@ -117,9 +117,6 @@ public class StandardRoot extends Lifecy
if (validate) {
path = validate(path);
}
-if (path == null) {
-return new String[] {};
-}
// Set because we don't want duplicates
// LinkedHashSet to retain the order. It is the order of the
@@ -143,9 +140,6 @@ public class StandardRoot extends Lifecy
@Override
public Set listWebAppPaths(String path) {
path = validate(path);
-if (path == null) {
-return null;
-}
// Set because we don't want duplicates
HashSet result = new HashSet<>();
@@ -165,9 +159,6 @@ public class StandardRoot extends Lifecy
@Override
public boolean mkdir(String path) {
path = validate(path);
-if (path == null) {
-return false;
-}
if (preResourceExists(path)) {
return false;
@@ -179,9 +170,6 @@ public class StandardRoot extends Lifecy
@Override
public boolean write(String path, InputStream is, boolean overwrite) {
path = validate(path);
-if (path == null) {
-return false;
-}
if (!overwrite && preResourceExists(path)) {
return false;
@@ -210,9 +198,6 @@ public class StandardRoot extends Lifecy
if (validate) {
path = validate(path);
}
-if (path == null) {
-return null;
-}
if (isCachingAllowed()) {
return cache.getResource(path, useClassLoaderResources);
@@ -295,9 +280,6 @@ public class StandardRoot extends Lifecy
private WebResource[] getResources(String path,
boolean useClassLoaderResources) {
path = validate(path);
-if (path == null) {
-return new WebResource[] {};
-}
ArrayList result = new ArrayList<>();
for (ArrayList list : allResources) {
@@ -327,9 +309,6 @@ public class StandardRoot extends Lifecy
if (validate) {
path = validate(path);
}
-if (path == null) {
-return new WebResource[] {};
-}
String[] resources = list(path, false);
WebResource[] result = new WebResource[resources.length];
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1573331&r1=1573330&r2=1573331&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 2 16:35:35 2014
@@ -74,10 +74,6 @@
elements and attributes supported by the Servlet version of the merged
file. (markt)
-
-Avoid internal NullPointerExceptions if a resource is
-requested from outside the web application root. (markt)
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5544 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1573323 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5545 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1573331 Blamelist: markt Build succeeded! sincerely, -The Buildbot
Re: svn commit: r1570115 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
On 25/02/2014 12:17, Konstantin Kolinko wrote: > Regarding the use of filesonly="true" in > http://svn.apache.org/r1570629 > > It is known that such setting breaks some jar scanning technologies, e.g > https://ecosystem.atlassian.net/browse/PLUG-949 > https://jira.springsource.org/browse/SPR-8551 > > I think none of those would scan Tomcat jars, so not a stopper. > Just mentioning it to encourage testing. I've just hit a problem with this and the ASF's Jira instance. It looks like Jira uses Apache Felix which turns Tomcat's Servlet JAR into an OSGI bundle somehow but the missing directories means that fails. The result is that Jira fails to start. I'm going to revert the filesonly change. I'll look into explicit excludes for the empty directories. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1573363 - /tomcat/trunk/build.xml
Author: markt
Date: Sun Mar 2 20:23:57 2014
New Revision: 1573363
URL: http://svn.apache.org/r1573363
Log:
Drop the use of filesonly - it caused failures with some applications that scan
Tomcat JARs such as Jira.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1573363&r1=1573362&r2=1573363&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Mar 2 20:23:57 2014
@@ -797,7 +797,7 @@
+ manifest="${tomcat.manifests}/default.manifest">
@@ -807,7 +807,7 @@
fullpath="META-INF/LICENSE" />
+ manifest="${tomcat.manifests}/default.manifest">
@@ -817,7 +817,7 @@
fullpath="META-INF/LICENSE" />
+ manifest="${tomcat.manifests}/default.manifest">
@@ -1531,8 +1531,7 @@
target="compile" />
+ manifest="${tomcat.manifests}/default.manifest">
@@ -1568,8 +1567,7 @@
+ manifest="${tomcat.manifests}/default.manifest">
@@ -1676,8 +1674,7 @@
description="Embedded packaging for those extras that can use it">
+ manifest="${tomcat.manifests}/default.manifest">
@@ -1698,8 +1695,7 @@
+ manifest="${tomcat.manifests}/default.manifest">
@@ -1930,8 +1926,7 @@ Apache Tomcat ${version} native binaries
-
+
@@ -2985,7 +2980,7 @@ Read the Building page on the Apache Tom
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1573364 - /tomcat/trunk/build.xml
Author: markt
Date: Sun Mar 2 20:35:43 2014
New Revision: 1573364
URL: http://svn.apache.org/r1573364
Log:
Alternative solution to avoiding adding empty packages to JARs.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1573364&r1=1573363&r2=1573364&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Mar 2 20:35:43 2014
@@ -299,6 +299,7 @@
+
@@ -334,6 +335,11 @@
+
+
+
+
+
@@ -343,6 +349,15 @@
+
+
+
+
+
+
+
+
+
@@ -1933,6 +1948,19 @@ Apache Tomcat ${version} native binaries
+
+
+
+
+
+
+
+
+
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1570115 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
2014-03-03 0:21 GMT+04:00 Mark Thomas : > On 25/02/2014 12:17, Konstantin Kolinko wrote: > >> Regarding the use of filesonly="true" in >> http://svn.apache.org/r1570629 >> >> It is known that such setting breaks some jar scanning technologies, e.g >> https://ecosystem.atlassian.net/browse/PLUG-949 >> https://jira.springsource.org/browse/SPR-8551 >> >> I think none of those would scan Tomcat jars, so not a stopper. >> Just mentioning it to encourage testing. > > > I've just hit a problem with this and the ASF's Jira instance. It looks > like Jira uses Apache Felix which turns Tomcat's Servlet JAR into an > OSGI bundle somehow but the missing directories means that fails. The > result is that Jira fails to start. > > I'm going to revert the filesonly change. I'll look into explicit > excludes for the empty directories. > It looks that it is possible to restrict resource collection itself to "files only" with resource set filtering. http://ant.apache.org/manual/Types/resources.html#rsel.type I wonder whether zip task will create directory entries in this case. Just noting. I have not experimented with this option. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1573368 - in /tomcat/trunk: java/org/apache/catalina/webresources/Cache.java webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 2 20:48:17 2014
New Revision: 1573368
URL: http://svn.apache.org/r1573368
Log:
Avoid NPE in resource cache when making an invalid request for a resource
outside of the web application.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1573368&r1=1573367&r2=1573368&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Sun Mar 2
20:48:17 2014
@@ -145,9 +145,7 @@ public class Cache {
private boolean noCache(String path) {
// Don't cache resources used by the class loader (it has its own
cache)
-// TODO. Review these exclusions once class loader resource handling is
-// complete
-if (path.startsWith("/WEB-INF/classes") ||
+if (path == null || path.startsWith("/WEB-INF/classes") ||
path.startsWith("/WEB-INF/lib")) {
return true;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1573368&r1=1573367&r2=1573368&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 2 20:48:17 2014
@@ -74,6 +74,10 @@
elements and attributes supported by the Servlet version of the merged
file. (markt)
+
+Avoid NullPointerException in resource cache when making
an
+invalid request for a resource outside of the web application. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1573370 - in /tomcat/trunk/java/org/apache/catalina/webresources: AbstractResourceSet.java Cache.java LocalStrings.properties StandardRoot.java
Author: markt
Date: Sun Mar 2 21:28:25 2014
New Revision: 1573370
URL: http://svn.apache.org/r1573370
Log:
Better way to avoid NPE in resource cache - don't let the request get that far
when we know we are going to fail it anyway.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1573370&r1=1573369&r2=1573370&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java
Sun Mar 2 21:28:25 2014
@@ -39,7 +39,8 @@ public abstract class AbstractResourceSe
protected final void checkPath(String path) {
if (path == null || path.length() == 0 || path.charAt(0) != '/') {
-throw new IllegalArgumentException();
+throw new IllegalArgumentException(
+sm.getString("abstractResourceSet.checkPath", path));
}
}
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1573370&r1=1573369&r2=1573370&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Sun Mar 2
21:28:25 2014
@@ -145,7 +145,7 @@ public class Cache {
private boolean noCache(String path) {
// Don't cache resources used by the class loader (it has its own
cache)
-if (path == null || path.startsWith("/WEB-INF/classes") ||
+if (path.startsWith("/WEB-INF/classes") ||
path.startsWith("/WEB-INF/lib")) {
return true;
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1573370&r1=1573369&r2=1573370&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
Sun Mar 2 21:28:25 2014
@@ -14,9 +14,12 @@
# limitations under the License.
abstractArchiveResourceSet.setReadOnlyFalse=Archive based WebResourceSets such
as those based on JARs are hard-coded to be read-only and may not be configured
to be read-write
+
abstractResource.getContentFail=Unable to return [{0}] as a byte array
abstractResource.getContentTooLarge=Unable to return [{0}] as a byte array
since the resource is [{1}] bytes in size which is larger than the maximum size
of a byte array
+abstractResourceSet.checkPath=The requested path [{0}] is not valid. It must
begin with "/".
+
cache.addFail=Unable to add the resource at [{0}] to the cache because there
was insufficient free space available after evicting expired cache entries -
consider increasing the maximum size of the cache
cache.backgroundEvictFail=The background cache eviction process was unable to
free [{0}] percent of the cache for Context [{1}] - consider increasing the
maximum size of the cache. After eviction approximately [{2}] KB of data
remained in the cache.
cache.objectMaxSizeTooBig=The value of [{0}]kB for objectMaxSize is larger
than the limit of maxSize/20 so has been reduced to [{1}]kB
@@ -37,6 +40,7 @@ standardRoot.createInvalidFile=Unable to
standardRoot.createNoFileResourceSet=The FileResourceSet feature has not yet
been implemented
standardRoot.createUnknownType=Unable to create WebResourceSet of unknown type
[{0}]
standardRoot.invalidPath=The resource path [{0}] is not valid
+standardRoot.invalidPathNormal=The resource path [{0}] has been normalized to
[{1}] which is not valid
standardRoot.lockedFile=The web application [{0}] failed to close the file
[{1}] opened via the following stack trace
standardRoot.noContext=A Context has not been configured for this
WebResourceRoot
standardRoot.startInvalidMain=The main resource set specified [{0}] is not
valid
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1573370&r1=1573369&r2=1573370&view=diff
==
--- tomcat/tr
[Bug 56093] org.apache.catalina.valves.SSLValve is not documented on the "Valves" page
https://issues.apache.org/bugzilla/show_bug.cgi?id=56093 --- Comment #2 from Konstantin Kolinko --- Fixed in 6.0 by r1573294 , will be in 6.0.40 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
