diff options
| author | George Wang <gwang@php.net> | 2014-09-08 23:58:05 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-09-09 00:01:03 -0400 |
| commit | 4bdd9aabdd9ddabac9fe253aab4c8366691c5171 (patch) | |
| tree | 1d92daba7304b59c7a1b8770f3a5687a987fec3f /sapi | |
| parent | 0cbfdc9df5632f293c757472cd5ad6ef46dd0179 (diff) | |
| download | php-git-4bdd9aabdd9ddabac9fe253aab4c8366691c5171.tar.gz | |
Fine tuned the order of adding request variables.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |