com php-src: Fine tuned the order of adding request variables.: sapi/litespeed/lsapi_main.c
| From: | George Wang | Date: | Tue, 09 Sep 2014 04:01:03 +0000 |
| Subject: | com php-src: Fine tuned the order of adding request variables.: sapi/litespeed/lsapi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81468@lists.php.net to get a copy of this message | ||
Commit: 4bdd9aabdd9ddabac9fe253aab4c8366691c5171
Author: George Wang <gwang@php.net> Mon, 8 Sep 2014 23:58:05 -0400
Parents: 0cbfdc9df5632f293c757472cd5ad6ef46dd0179
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4bdd9aabdd9ddabac9fe253aab4c8366691c5171
Log:
Fine tuned the order of adding request variables.
Changed paths:
M sapi/litespeed/lsapi_main.c
Diff:
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index cb7c66b..789ebf2 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);