cvs: php4 /sapi/fastcgi fastcgi.c
| From: | Ben Mansell | Date: | Fri, 04 May 2001 09:49:15 +0000 |
| Subject: | cvs: php4 /sapi/fastcgi fastcgi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5523@lists.php.net to get a copy of this message | ||
joosters Fri May 4 02:49:15 2001 EDT
Modified files:
/php4/sapi/fastcgi fastcgi.c
Log:
Removed a duplicate php_import_environment_variables() call
from fastcgi sapi
Index: php4/sapi/fastcgi/fastcgi.c
diff -u php4/sapi/fastcgi/fastcgi.c:1.4 php4/sapi/fastcgi/fastcgi.c:1.5
--- php4/sapi/fastcgi/fastcgi.c:1.4 Wed May 2 10:19:58 2001
+++ php4/sapi/fastcgi/fastcgi.c Fri May 4 02:49:14 2001
@@ -126,10 +126,13 @@
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;