Author: markt
Date: Wed Dec 31 05:49:30 2008
New Revision: 730396
URL: http://svn.apache.org/viewvc?rev=730396&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46232
Don't override the endorsed dir if the user has set it
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/setclasspath.bat
tomcat/tc6.0.x/trunk/bin/setclasspath.sh
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 31 05:49:30 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,726052,728032,728947,729057
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710125,710205,711126,711600,712461,718360,719602,719626,719628,720069,723404,723738,726052,727303,728032,728947,729057,730250
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730396&r1=730395&r2=730396&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 31 05:49:30 2008
@@ -191,14 +191,6 @@
possibly be exploited by a malicious webapp.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46232
- Don't override the endorsed dir if the user has set it
- http://svn.apache.org/viewvc?rev=723738&view=rev
- http://svn.apache.org/viewvc?rev=727303&view=rev
- http://svn.apache.org/viewvc?rev=730250&view=rev
- +1: markt, fhanik, jim
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46304
Excludes performance issues
Use Principal when calling doFilterEvent()
Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=730396&r1=730395&r2=730396&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Wed Dec 31 05:49:30 2008
@@ -61,8 +61,11 @@
goto exit
:okBasedir
+rem Don't override the endorsed dir if the user has set it previously
+if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir
rem Set the default -Djava.endorsed.dirs argument
set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed
+:gotEndorseddir
rem Set standard CLASSPATH
rem Note that there are no quotes as we do not want to introduce random
Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?rev=730396&r1=730395&r2=730396&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Wed Dec 31 05:49:30 2008
@@ -95,8 +95,11 @@
fi
fi
-# Set the default -Djava.endorsed.dirs argument
-JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed
+# Don't override the endorsed dir if the user has set it previously
+if [ -z "$JAVA_ENDORSED_DIRS" ]; then
+ # Set the default -Djava.endorsed.dirs argument
+ JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed
+fi
# Set standard CLASSPATH
if [ "$1" = "javac" ] ; then
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=730396&r1=730395&r2=730396&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 31 05:49:30 2008
@@ -209,6 +209,10 @@
manifest. (markt)
</fix>
<fix>
+ <bug>46232</bug>: Enabled the XMl parser to be over-ridden using the
+ standard endorsed mechanism. (markt)
+ </fix>
+ <fix>
<bug>46403</bug>: Provide a workaround for an IE and Safari bug that
means the Max-Age attribute of a cookie is ignored. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
