cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c
| From: | David Soria Parra | Date: | Fri, 09 Jan 2009 22:13:55 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55503@lists.php.net to get a copy of this message | ||
dsp Fri Jan 9 22:13:55 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
MFH: 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.267.2.15.2.50.2.34&r2=1.267.2.15.2.50.2.35&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.34
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.35
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.34 Wed Dec 31 14:27:09 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Jan 9 22:13:55 2009
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.34 2008/12/31 14:27:09 helly Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.35 2009/01/09 22:13:55 dsp Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1064,7 +1064,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