Correct mod_cgid's argv[0] so that the full path can be delved by the

  invoked cgi application, to conform to the behavior of mod_cgi.

PR: 34542
Reviewed by: Andre, OtherBill
Submitted by: Pradeep Kumar S <pradeep.smani gmail.com>

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

diff --git a/CHANGES b/CHANGES
index 8f83c3359c6ac4ac52e6f72aff71b4dd432b447d..5392692e4686683f685944701a79aaf72e2be3b7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) Doxygen fixup [Neale Ranns neale ranns.org, Ian Holsman]
+  *) Correct mod_cgid's argv[0] so that the full path can be delved by the
+     invoked cgi application, to conform to the behavior of mod_cgi.
+     [Pradeep Kumar S <pradeep.smani gmail.com>]
+
+  *) Doxygen fixup [Neale Ranns <neale ranns.org>, Ian Holsman]
 
   *) prefork, worker and event MPMs: Support a graceful-stop procedure:
      Server will wait until existing requests are finished or until  

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 80ad1b4bbe7e60f89f96dd24f8b23160685c7111..7daad06685b14cbb51e2b32995655d8cbcf72ab3 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1319,10 +1319,7 @@ static int cgid_handler(request_rec *r)
  
     nph = !(strncmp(argv0, "nph-", 4)); 
 
-    if ((argv0 = strrchr(r->filename, '/')) != NULL) 
-        argv0++; 
-    else 
-        argv0 = r->filename; 
+    argv0 = r->filename; 
 
     if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r)) 
         return log_scripterror(r, conf, HTTP_FORBIDDEN, 0,