Author: markt
Date: Wed Jul 30 13:42:51 2008
New Revision: 681198
URL: http://svn.apache.org/viewvc?rev=681198&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
Reduce issues caused by copy/paste and different engine names
Modified:
tomcat/container/tc5.5.x/catalina/src/conf/server.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/container/tc5.5.x/catalina/src/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/server.xml?rev=681198&r1=681197&r2=681198&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/conf/server.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/server.xml Wed Jul 30 13:42:51
2008
@@ -134,7 +134,7 @@
on to the appropriate Host (virtual host). -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<!-- Define the top level container in our container hierarchy -->
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681198&r1=681197&r2=681198&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 13:42:51 2008
@@ -82,6 +82,10 @@
when running with a security manager. (markt)
</fix>
<fix>
+ <bug>44943</bug>: Reduce copy/paste issues caused by different engine
+ names in server.xml. (markt)
+ </fix>
+ <fix>
<bug>45293</bug>: Update name of commons-logging jar in security
policy.
(markt)
</fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681198&r1=681197&r2=681198&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:42:51 2008
@@ -94,12 +94,6 @@
+1: markt, yoavs
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
- Reduce issues caused by copy/paste and different engine names
- http://svn.apache.org/viewvc?rev=654177&view=rev
- +1: markt, fhanik, yoavs
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42943
Make sure nested element is inside <jsp:text> element before throwing
exception.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
