com php-src: Fine tuned the order of adding request variables.: sapi/litespeed/lsapi_main.c

From: Date: Tue, 09 Sep 2014 03:58:05 +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-81466@lists.php.net to get a copy of this message
Commit: d2e1a04b1011e15321b9748f76620786418b7893 Author: George Wang <gwang@php.net> Mon, 8 Sep 2014 23:58:05 -0400 Parents: 582f42b8d47fb85edc846a6c739b85a1653e0852 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d2e1a04b1011e15321b9748f76620786418b7893 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);

« previous php.cvs (#81466) next »