Author: markt
Date: Fri Feb 11 15:21:54 2011
New Revision: 1069832
URL: http://svn.apache.org/viewvc?rev=1069832&view=rev
Log:
Add additional information to assist with tracking down the root cause of
https://issues.apache.org/bugzilla/show_bug.cgi?id=50737
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1069832&r1=1069831&r2=1069832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Fri Feb 11
15:21:54 2011
@@ -119,7 +119,9 @@ public class ExpandWar {
// Trying to expand outside the docBase
// Throw an exception to stop the deployment
throw new IllegalArgumentException(
- sm.getString("expandWar.illegalPath",war, name));
+ sm.getString("expandWar.illegalPath",war, name,
+ expandedFile.getCanonicalPath(),
+ canonicalDocBasePrefix));
}
int last = name.lastIndexOf('/');
if (last >= 0) {
@@ -220,7 +222,9 @@ public class ExpandWar {
// Entry located outside the docBase
// Throw an exception to stop the deployment
throw new IllegalArgumentException(
- sm.getString("expandWar.illegalPath",war, name));
+ sm.getString("expandWar.illegalPath",war, name,
+ expandedFile.getCanonicalPath(),
+ canonicalDocBasePrefix));
}
}
} catch (IOException e) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1069832&r1=1069831&r2=1069832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Fri
Feb 11 15:21:54 2011
@@ -69,7 +69,7 @@ engineConfig.start=EngineConfig: Process
engineConfig.stop=EngineConfig: Processing STOP
expandWar.copy=Error copying {0} to {1}
expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of
the remaining files may cause problems
-expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an
entry contains an illegal path [{1}]
+expandWar.illegalPath=The archive [{0}] is malformed and will be ignored: an
entry contains an illegal path [{1}] which was not expanded to [{2}] since that
is outside of the defined docBase [{3}]
hostConfig.appBase=Application base directory {0} does not exist
hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
hostConfig.cce=Lifecycle event data object {0} is not a Host
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1069832&r1=1069831&r2=1069832&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 11 15:21:54 2011
@@ -67,6 +67,10 @@
<bug>50721</bug>: Correctly handle URL decoding where the URL ends in
%nn. Patch provided by Christof Marti. (markt)
</fix>
+ <add>
+ <bug>50737</bug>: Add additional information when an invalid WAR file
is
+ detected. (markt)
+ </add>
<fix>
<bug>50748</bug>: Allow the content length header to be set up to the
point the response is committed when a writer is being used. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
