Port fix for bug 40817.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@471267 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java
index b685fea..8190005 100644 (file)
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -932,10 +932,8 @@ public final class CGIServlet extends HttpServlet {
                 }
                 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;
@@ -1134,6 +1132,8 @@ public final class CGIServlet extends HttpServlet {
 
             envp.put("X_TOMCAT_SCRIPT_PATH", command);  //for kicks
 
+            envp.put("SCRIPT_FILENAME", command);  //for PHP
+
             this.env = envp;
 
             return true;