FastCGI environment variables must not be overriden by system environment variables

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 7acbd23c07ea340af5a7ba28fd4fc8f20be2f0b8..dfe04c82d74cf494df26b8c0f1398b8622815ef4 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -472,6 +472,10 @@ void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
            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;
@@ -490,8 +494,6 @@ void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
                }
                PG(magic_quotes_gpc) = magic_quotes_gpc;
        }
-       /* call php's original import as a catch-all */
-       php_php_import_environment_variables(array_ptr TSRMLS_CC);
 }
 #endif