Commit 9c9de5c7 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent db3f4170

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- 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]










































STATUS



+0
−6



























Changes for STATUS: 0 added lines, 6 removed lines.



Original line number
Diff line number
Diff line







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


































modules/generators/mod_cgid.c



+0
−3



























Changes for modules/generators/mod_cgid.c: 0 added lines, 3 removed lines.



Original line number
Diff line number
Diff line







@@ -1278,9 +1278,6 @@ static int cgid_handler(request_rec *r)







 









    nph = !(strncmp(argv0, "nph-", 4)); 



















    if ((argv0 = strrchr(r->filename, '/')) != NULL) 









        argv0++; 









    else 









    argv0 = r->filename; 



















    if (!(ap_allow_options(r) & OPT_EXECCGI) && !is_scriptaliased(r))