tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r471267 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Date Sat, 04 Nov 2006 21:41:00 GMT
Author: markt
Date: Sat Nov  4 13:40:59 2006
New Revision: 471267

URL: http://svn.apache.org/viewvc?view=rev&rev=471267
Log:
Port fix for bug 40817.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?view=diff&rev=471267&r1=471266&r2=471267
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Sat Nov  4 13:40:59
2006
@@ -932,10 +932,8 @@
                 }
                 path = currentLocation.getAbsolutePath();
                 name = currentLocation.getName();
-                cginame =
-                currentLocation.getParent().substring(webAppRootDir.length())
-                + File.separator
-                + name;
+                cginame = (currentLocation.getParent() + File.separator).
+                        substring(webAppRootDir.length()) + name;
 
                 if (".".equals(contextPath)) {
                     scriptname = servletPath + cginame;
@@ -1133,6 +1131,8 @@
             command = fCGIFullPath.getCanonicalPath();
 
             envp.put("X_TOMCAT_SCRIPT_PATH", command);  //for kicks
+
+            envp.put("SCRIPT_FILENAME", command);  //for PHP
 
             this.env = envp;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message