dmitry Thu Aug 31 13:12:18 2006 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
FastCGI environment variables must not be overriden by system environment
variables
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.297&r2=1.298&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.297 php-src/sapi/cgi/cgi_main.c:1.298
--- php-src/sapi/cgi/cgi_main.c:1.297 Tue Jun 27 08:26:53 2006
+++ php-src/sapi/cgi/cgi_main.c Thu Aug 31 13:12:18 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.297 2006/06/27 08:26:53 tony2001 Exp $ */
+/* $Id: cgi_main.c,v 1.298 2006/08/31 13:12:18 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -451,6 +451,10 @@
zval_copy_ctor(array_ptr);
return;
}
+
+ /* call php's original import as a catch-all */
+ php_php_import_environment_variables(array_ptr TSRMLS_CC);
+
if (fcgi_is_fastcgi()) {
fcgi_request *request = (fcgi_request*) SG(server_context);
HashPosition pos;
@@ -466,8 +470,6 @@
php_register_variable(var.s, *val, array_ptr TSRMLS_CC);
}
}
- /* call php's original import as a catch-all */
- php_php_import_environment_variables(array_ptr TSRMLS_CC);
}
static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
