dsp             Tue Jun  9 13:32:12 2009 UTC

  Modified files:              
    /php-src/sapi/cgi   cgi_main.c 
  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.383&r2=1.384&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.383 php-src/sapi/cgi/cgi_main.c:1.384
--- php-src/sapi/cgi/cgi_main.c:1.383   Thu Jun  4 11:51:10 2009
+++ php-src/sapi/cgi/cgi_main.c Tue Jun  9 13:32:12 2009
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.383 2009/06/04 11:51:10 jani Exp $ */
+/* $Id: cgi_main.c,v 1.384 2009/06/09 13:32:12 dsp Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1082,8 +1082,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

Reply via email to