Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Message-ID: <20050911130407.29208.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r280123 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
 modules/generators/mod_cgid.c
Date: Sun, 11 Sep 2005 13:04:06 -0000
To: cvs@httpd.apache.org
From: trawick@apache.org

Author: trawick
Date: Sun Sep 11 06:04:03 2005
New Revision: 280123

URL: http://svn.apache.org/viewcvs?rev=280123&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=280123&r1=280122&r2=280123&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Sun Sep 11 06:04:03 2005
@@ -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]
 

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=280123&r1=280122&r2=280123&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Sun Sep 11 06:04:03 2005
@@ -208,12 +208,6 @@
        +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

Modified: httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c?rev=280123&r1=280122&r2=280123&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.0.x/modules/generators/mod_cgid.c Sun Sep 11 06:04:03 2005
@@ -1278,10 +1278,7 @@
  
     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,