dsp Tue Jun 9 13:31:39 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cgi cgi_main.c Log: MFH: Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non apache). The fix was provided by Sriram Natarajan. http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.40&r2=1.267.2.15.2.50.2.41&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.40 php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.41 --- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.40 Thu Jun 4 11:51:43 2009 +++ php-src/sapi/cgi/cgi_main.c Tue Jun 9 13:31:39 2009 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.40 2009/06/04 11:51:43 jani Exp $ */ +/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.41 2009/06/09 13:31:39 dsp Exp $ */ #include "php.h" #include "php_globals.h" @@ -1085,8 +1085,8 @@ } if (env_path_translated != NULL && env_redirect_url != NULL && - orig_script_filename != NULL && script_path_translated != NULL - ) { + env_path_translated != script_path_translated && + strcmp(env_path_translated, script_path_translated) != 0) { /* * 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