Re: cvs: php-src /sapi/cgi cgi_main.c
| From: | David Soria Parra | Date: | Fri, 09 Jan 2009 22:30:45 +0000 |
| Subject: | Re: cvs: php-src /sapi/cgi cgi_main.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-55507@lists.php.net to get a copy of this message | ||
Forgot to mention:
Patch was provided by Sriram Natarajan <Sriram.Natarajan Sun.COM>
David Soria Parra schrieb:
dsp Fri Jan 9 22:13:40 2009 UTCModified files: /php-src/sapi/cgi cgi_main.c Log:Fixed bug #47042 (PHP cgi sapi is removing SCRIPT_FILENAME for non apache). http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.373&r2=1.374&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.373 php-src/sapi/cgi/cgi_main.c:1.374 --- php-src/sapi/cgi/cgi_main.c:1.373 Wed Dec 31 11:12:39 2008 +++ php-src/sapi/cgi/cgi_main.c Fri Jan 9 22:13:40 2009 @@ -21,7 +21,7 @@+----------------------------------------------------------------------+*/ -/* $Id: cgi_main.c,v 1.373 2008/12/31 11:12:39 sebastian Exp $ */ +/* $Id: cgi_main.c,v 1.374 2009/01/09 22:13:40 dsp Exp $ */ #include "php.h" #include "php_globals.h" @@ -1062,7 +1062,9 @@ TRANSLATE_SLASHES(env_document_root); } - if (env_path_translated != NULL && env_redirect_url != NULL) { + if (env_path_translated != NULL && env_redirect_url != NULL &&+ orig_script_filename != NULL && script_path_translated != NULL && + strcmp(orig_script_filename, script_path_translated) != 0) {/* pretty much apache specific. If we have a redirect_url then our script_filename and script_name point to the