From 4bdd9aabdd9ddabac9fe253aab4c8366691c5171 Mon Sep 17 00:00:00 2001 From: George Wang Date: Mon, 8 Sep 2014 23:58:05 -0400 Subject: Fine tuned the order of adding request variables. --- sapi/litespeed/lsapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sapi') diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index cb7c66b44a..789ebf2460 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -311,6 +311,8 @@ static void sapi_lsapi_register_variables(zval *track_vars_array TSRMLS_DC) if ( (SG(request_info).request_uri ) ) php_self = (SG(request_info).request_uri ); + litespeed_php_import_environment_variables(track_vars_array TSRMLS_CC); + #if ((PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4) || PHP_MAJOR_VERSION < 5) if (!PG(magic_quotes_gpc)) { #endif @@ -324,7 +326,6 @@ static void sapi_lsapi_register_variables(zval *track_vars_array TSRMLS_DC) add_variable_magic_quote("PHP_SELF", 8, php_self, strlen( php_self ), track_vars_array ); } #endif - litespeed_php_import_environment_variables(track_vars_array TSRMLS_CC); } else { php_import_environment_variables(track_vars_array TSRMLS_CC); -- cgit v1.2.1