summaryrefslogtreecommitdiff
path: root/sapi/fastcgi
diff options
context:
space:
mode:
authorBen Mansell <joosters@php.net>2001-05-04 09:49:14 +0000
committerBen Mansell <joosters@php.net>2001-05-04 09:49:14 +0000
commit13e4699ae302c5aeed20ae5feba7bdd5b2941092 (patch)
tree878422b32ce54e60bc03562887e133c456921532 /sapi/fastcgi
parenta3d3819f6fa936afab7ee97939e595275882699f (diff)
downloadphp-git-13e4699ae302c5aeed20ae5feba7bdd5b2941092.tar.gz
Removed a duplicate php_import_environment_variables() call
from fastcgi sapi
Diffstat (limited to 'sapi/fastcgi')
-rw-r--r--sapi/fastcgi/fastcgi.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index 92b0e36c2a..cc96a6d7f0 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -126,10 +126,13 @@ static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC
char *self = getenv("REQUEST_URI");
char *ptr = strchr( self, '?' );
- /* In CGI mode, we consider the environment to be a part of the server
- * variables
- */
- php_import_environment_variables(track_vars_array ELS_CC PLS_CC);
+ /*
+ * note that the environment will already have been set up
+ * via fastcgi_module_main(), below.
+ *
+ * fastcgi_module_main() -> php_request_startup() ->
+ * php_hash_environment() -> php_import_environment_variables()
+ */
/* strip query string off this */
if ( ptr ) *ptr = 0;