dsp Tue Jun 9 13:29:40 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
/php-src NEWS
Log:
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.70&r2=1.267.2.15.2.71&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.70
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.71
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.70 Thu Jun 4 11:53:38 2009
+++ php-src/sapi/cgi/cgi_main.c Tue Jun 9 13:29:39 2009
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.70 2009/06/04 11:53:38 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.71 2009/06/09 13:29:39 dsp Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -964,7 +964,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
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1548&r2=1.2027.2.547.2.1549&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1548 php-src/NEWS:1.2027.2.547.2.1549
--- php-src/NEWS:1.2027.2.547.2.1548 Tue Jun 9 12:16:31 2009
+++ php-src/NEWS Tue Jun 9 13:29:39 2009
@@ -34,6 +34,8 @@
(Nuno, Scott)
- Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
(Kanwaljeet Singla, Venkat Raman Don)
+- Fixed bug #47042 (cgi sapi is incorrectly removing SCRIPT_FILENAME).
+ (Sriram Natarajan, David Soria Parra)
27 May 2009, PHP 5.2.10RC1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
