dsp             Fri Jan  9 22:14:20 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /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/NEWS?r1=1.2027.2.547.2.1386&r2=1.2027.2.547.2.1387&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1386 php-src/NEWS:1.2027.2.547.2.1387
--- php-src/NEWS:1.2027.2.547.2.1386    Fri Jan  9 07:17:57 2009
+++ php-src/NEWS        Fri Jan  9 22:14:20 2009
@@ -15,6 +15,8 @@
   APA Laboratory (Fixes CVE-2008-5498). (Scott)
 - Fixed a segfault when malformed string is passed to json_decode(). (Scott)
 
+- Fixed bug #47042 (PHP cgi sapi is removing SCRIPT_FILENAME for non apache).
+  (Sriram Natarajan)
 - Fixed bug #47037 (No error when using fopen with empty string). 
   (Cristian Rodriguez R., Felipe)
 - Fixed bug #47035 (dns_get_record returns a garbage byte at the end of a TXT 
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.67&r2=1.267.2.15.2.68&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.67 
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.67 Wed Dec 31 11:17:48 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Jan  9 22:14:20 2009
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.67 2008/12/31 11:17:48 sebastian Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.68 2009/01/09 22:14:20 dsp Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -960,7 +960,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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to