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/07/30 19:46:09 UTC
svn commit: r681141 - in /tomcat:
container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Author: markt
Date: Wed Jul 30 10:46:08 2008
New Revision: 681141
URL: http://svn.apache.org/viewvc?rev=681141&view=rev
Log:
Fix CGI Servlet for Vista
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?rev=681141&r1=681140&r2=681141&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java Wed Jul 30 10:46:08 2008
@@ -667,9 +667,7 @@
if (OS.indexOf("windows 9") > -1) {
p = r.exec( "command.com /c set" );
ignoreCase = true;
- } else if ( (OS.indexOf("nt") > -1)
- || (OS.indexOf("windows 20") > -1)
- || (OS.indexOf("windows xp") > -1) ) {
+ } else if ((OS.indexOf("nt") > -1) || (OS.indexOf("windows") > -1) ) {
// thanks to JuanFran for the xp fix!
p = r.exec( "cmd.exe /c set" );
ignoreCase = true;
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=681141&r1=681140&r2=681141&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 10:46:08 2008
@@ -54,6 +54,9 @@
is made to any read(), ready(), mark(), reset(), or skip() method as per
javadocs for Reader. (markt)
</fix>
+ <fix>
+ Enable the CGIServlet to work with Windows Vista. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681141&r1=681140&r2=681141&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:46:08 2008
@@ -41,11 +41,6 @@
+1: markt
-1: fhanik - Rainer backported all the fixes, we should evaluate those, I'll add them at the bottom
-* Fix CGI servlet for vista
- http://people.apache.org/~markt/patches/2008-03-28-cgi-env.patch
- +1: markt, fhanik, yoavs
- -1:
-
* No roles (deny all) trumps no auth-constraint (allow all)
https://issues.apache.org/bugzilla/show_bug.cgi?id=44529
http://svn.apache.org/viewvc?rev=642542&view=rev
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org