dsp Mon Jan 19 18:18:00 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
Log:
MFH: Fix #47149. Remove check for script_filename = path_translated, as this
the actual value that we get from apache.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.68&r2=1.267.2.15.2.69&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.68
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.69
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.68 Fri Jan 9 22:14:20 2009
+++ php-src/sapi/cgi/cgi_main.c Mon Jan 19 18:17:59 2009
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.68 2009/01/09 22:14:20 dsp Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.69 2009/01/19 18:17:59 dsp Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -961,8 +961,7 @@
}
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) {
+ orig_script_filename != NULL &&
script_path_translated != NULL) {
/*
pretty much apache specific. If we have a
redirect_url
then our script_filename and script_name
point to the
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
