Get exe CGI's working again on Windows

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87359 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5ed04cce500106cf16af6902b1dc60ad7aa8d9b6..3c8515f62b3fb0447b11da5c1e858981eb9d737a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0b1
 
+  *) Get exe CGI's working again on Windows.
+     [Allan Edwards]
+
   *) Get mod_cgid and mod_rewrite to work as DSOs by changing the way
      they keep track of whether or not their  post config hook has been
      called before.  Instead of a static variable (which is replaced when 

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index f5660c94ec19c9e0e08fa9f27dcbedfb4e4e3df4..b161ff61d59e3fcb7d8b09eceec975418d305770 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -477,7 +477,7 @@ static apr_status_t build_command_line(const char **cmd, request_rec *r,
     /*
      * Build the command string to pass to ap_os_create_privileged_process()
      */
-    quoted_filename = apr_pstrcat(p, "\"", argv0, "\"", NULL);
+    quoted_filename = apr_pstrcat(p, "\"", r->filename, "\"", NULL);
     if (interpreter && *interpreter) {
         if (arguments && *arguments)
             *cmd = apr_pstrcat(p, interpreter, " ", quoted_filename, " ", 
@@ -492,7 +492,7 @@ static apr_status_t build_command_line(const char **cmd, request_rec *r,
         *cmd = apr_pstrcat(p, quoted_filename, NULL);
     }
 #else
-    *cmd = argv0;
+    *cmd = apr_pstrcat(p, r->filename, NULL);
 #endif
     return APR_SUCCESS;
 }