You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/04/16 23:35:22 UTC
svn commit: r648863 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml
webapps/docs/changelog.xml
Author: markt
Date: Wed Apr 16 14:35:20 2008
New Revision: 648863
URL: http://svn.apache.org/viewvc?rev=648863&view=rev
Log:
Update web.xml to reflect packaging of CGI and SSI.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648863&r1=648862&r2=648863&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:35:20 2008
@@ -55,11 +55,6 @@
+0: remm: do we really want to fix these sort of "bugs" ?
-1:
-* Update comments re JAR renaming in web.xml
- http://svn.apache.org/viewvc?rev=639771&view=rev
- +1: markt, fhanik, rjung
- -1:
-
* Fix NIO/Sendfile problem
http://svn.apache.org/viewvc?rev=644858&view=rev
http://svn.apache.org/viewvc?rev=644860&view=rev
Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=648863&r1=648862&r2=648863&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Wed Apr 16 14:35:20 2008
@@ -277,11 +277,6 @@
<!-- -->
<!-- outputEncoding The encoding to use for the page that results -->
<!-- from the SSI processing. [UTF-8] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI servlet, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
<!--
<servlet>
@@ -334,10 +329,6 @@
<!-- -->
<!-- passShellEnvironment Should the shell environment variables (if -->
<!-- any) be passed to the CGI script? [false] -->
- <!-- -->
- <!-- IMPORTANT: To use the CGI servlet, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-cgi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-cgi.jar -->
<!--
<servlet>
@@ -438,11 +429,6 @@
<!-- Should "virtual" paths be interpreted as -->
<!-- relative to the context root, instead of -->
<!-- the server root? (0=false, 1=true) [0] -->
- <!-- -->
- <!-- -->
- <!-- IMPORTANT: To use the SSI filter, you also need to rename the -->
- <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
- <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
<!--
<filter>
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=648863&r1=648862&r2=648863&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 14:35:20 2008
@@ -91,6 +91,9 @@
<fix>
Add permission required to read JDK logging config. (markt)
</fix>
+ <fix>
+ Update web.xml to reflect packaging of SSI and CGI. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org