From 02344b1dae6dfba37932b96f6af9f75a1722c683 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 16 Mar 2004 19:49:19 +0000 Subject: [PATCH] Improve the way auto-globals JIT works, and add the ability to turn it off --- main/main.c | 1 + main/php_globals.h | 1 + main/php_variables.c | 15 ++++++++------- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/main/main.c b/main/main.c index 680a7b4922..b44c282d9d 100644 --- a/main/main.c +++ b/main/main.c @@ -273,6 +273,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("register_argc_argv", "1", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_argc_argv, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_globals", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_globals, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_long_arrays", "1", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_long_arrays, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("auto_globals_jit", "1", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, auto_globals_jit, php_core_globals, core_globals) #if PHP_SAFE_MODE STD_PHP_INI_BOOLEAN("safe_mode", "1", PHP_INI_SYSTEM, OnUpdateBool, safe_mode, php_core_globals, core_globals) #else diff --git a/main/php_globals.h b/main/php_globals.h index 2d9a0fdfbe..5d8530850f 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -121,6 +121,7 @@ struct _php_core_globals { zend_bool register_globals; zend_bool register_long_arrays; zend_bool register_argc_argv; + zend_bool auto_globals_jit; zend_bool y2k_compliance; diff --git a/main/php_variables.c b/main/php_variables.c index 3cf65a04e4..668015f7f8 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -543,6 +543,7 @@ static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC); static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRMLS_DC); + /* {{{ php_hash_environment */ int php_hash_environment(TSRMLS_D) @@ -551,7 +552,7 @@ int php_hash_environment(TSRMLS_D) unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0}; zval *dummy_track_vars_array = NULL; zend_bool initialized_dummy_track_vars_array=0; - zend_bool jit_initialization = (!PG(register_globals) && !PG(register_long_arrays)); + zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_globals) && !PG(register_long_arrays) && !PG(register_argc_argv)); struct auto_global_record { char *name; uint name_len; @@ -609,6 +610,7 @@ int php_hash_environment(TSRMLS_D) case 'e': case 'E': if (!jit_initialization && !_gpc_flags[3]) { + zend_auto_global_disable_jit("_ENV", sizeof("_ENV")-1 TSRMLS_CC); php_auto_globals_create_env("_ENV", sizeof("_ENV")-1 TSRMLS_CC); _gpc_flags[3]=1; if (PG(register_globals)) { @@ -619,6 +621,7 @@ int php_hash_environment(TSRMLS_D) case 's': case 'S': if (!jit_initialization && !_gpc_flags[4]) { + zend_auto_global_disable_jit("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); php_register_server_variables(TSRMLS_C); _gpc_flags[4]=1; if (PG(register_globals)) { @@ -660,6 +663,7 @@ int php_hash_environment(TSRMLS_D) /* Create _REQUEST */ if (!jit_initialization) { + zend_auto_global_disable_jit("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC); php_auto_globals_create_request("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC); } @@ -746,15 +750,12 @@ static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRML void php_startup_auto_globals(TSRMLS_D) { - zend_bool cb = (!PG(register_globals) && !PG(register_long_arrays)); - - /*cb = 0;*/ zend_register_auto_global("_GET", sizeof("_GET")-1, NULL TSRMLS_CC); zend_register_auto_global("_POST", sizeof("_POST")-1, NULL TSRMLS_CC); zend_register_auto_global("_COOKIE", sizeof("_COOKIE")-1, NULL TSRMLS_CC); - zend_register_auto_global("_SERVER", sizeof("_SERVER")-1, cb?php_auto_globals_create_server:NULL TSRMLS_CC); - zend_register_auto_global("_ENV", sizeof("_ENV")-1, cb?php_auto_globals_create_env:NULL TSRMLS_CC); - zend_register_auto_global("_REQUEST", sizeof("_REQUEST")-1, cb?php_auto_globals_create_request:NULL TSRMLS_CC); + zend_register_auto_global("_SERVER", sizeof("_SERVER")-1, php_auto_globals_create_server TSRMLS_CC); + zend_register_auto_global("_ENV", sizeof("_ENV")-1, php_auto_globals_create_env TSRMLS_CC); + zend_register_auto_global("_REQUEST", sizeof("_REQUEST")-1, php_auto_globals_create_request TSRMLS_CC); zend_register_auto_global("_FILES", sizeof("_FILES")-1, NULL TSRMLS_CC); } -- 2.50.1