backport from trunk:

   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>]

Reviewed by: wrowe, colm, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@280123 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 323f933bfb7b98902eee0b667399bce7a0962500..05c136ae83da2aefc337e8baeb9ca34b7d52680f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.55
 
+  *) 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>]
+
   *) mod_include: Fix possible environment variable corruption when 
      using nested includes.  PR 12655.  [Joe Orton]
 

diff --git a/STATUS b/STATUS
index 330a7b54573ba5a43e50a1da36b10cad20de6a0e..6ea68bbd6c4b610e76180716073a22746d93bdf4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -208,12 +208,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        +1: pquerna, nd, wrowe
        Votes from before the integration branch: +1: jerenkrantz
 
-    *) 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  Submitted by: Pradeep Kumar S <pradeep.smani gmail.com>
-         http://svn.apache.org/viewcvs?view=rev&rev=264623
-       +1: wrowe, colm, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index a14326f23f3895195aeea9a78df5c99be66836fa..5dd50704ddeeb2ca7de9c84f48a70cb0e864802a 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1278,10 +1278,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,