From: Kalle Sommer Nielsen Date: Wed, 21 Apr 2010 01:27:22 +0000 (+0000) Subject: Removed register_globals X-Git-Tag: php-5.4.0alpha1~191^2~1723 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=febee112850af0e56a57e2b38c9043c07dc99465;p=php Removed register_globals --- diff --git a/INSTALL b/INSTALL index f9c16f6bb5..7675ec08ed 100644 --- a/INSTALL +++ b/INSTALL @@ -716,14 +716,6 @@ CGI environment and recommended modifications in php.ini the web server not from the administration server. Use the command line as root user and start it manually - you will see there are no CGI-like environment variables. - - Simply change your scripts to get CGI variables in the correct way for - PHP 4.x by using the superglobal $_SERVER. If you have older scripts - which use $HTTP_HOST, etc., you should turn on register_globals in - php.ini and change the variable order too (important: remove "E" from - it, because you do not need the environment here): -variables_order = "GPCS" -register_globals = On __________________________________________________________________ Special use for error pages or self-made directory listings (PHP >= 4.3.3) @@ -1532,7 +1524,7 @@ The configuration file ; Boolean values can be set to either: ; true, on, yes ; or false, off, no, none -register_globals = off +html_errors = off track_errors = yes ; you can enclose strings in double-quotes diff --git a/NEWS b/NEWS index 22a9a60e7a..2493a5f356 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ time are allocated in a single copy and never changed. (Dmitry) - Added an optimization which saves memory and emalloc/efree calls for empty HashTables (Stas, Dmitry) + - Added Tokyo Cabinet abstract DB support to ext/dba. (Michael Maclean) - Added Jenkins's one-at-a-time hash support to ext/hash. (Martin Jansen) - Added FNV-1 hash support to ext/hash. (Michael Maclean) @@ -30,6 +31,7 @@ - Removed legacy features: (Kalle) . define_syslog_variables ini option and its associated function. + . register_globals. . register_long_arrays ini option. . y2k_compliance ini option. diff --git a/README.input_filter b/README.input_filter index 8fb8244bd8..4b83b9d113 100644 --- a/README.input_filter +++ b/README.input_filter @@ -19,9 +19,7 @@ A simple implementation might look like the following. This stores the original raw user data and adds a my_get_raw() function while the normal $_POST, $_GET and $_COOKIE arrays are only populated with stripped data. In this simple example all I am doing is calling strip_tags() on -the data. If register_globals is turned on, the default globals that -are created will be stripped ($foo) while a $RAW_foo is created with the -original user input. +the data. ZEND_BEGIN_MODULE_GLOBALS(my_input_filter) zval *post_array; @@ -155,8 +153,6 @@ PHP_FUNCTION(my_get_raw) int var_len; zval **tmp; zval *array_ptr = NULL; - HashTable *hash_ptr; - char *raw_var; if(zend_parse_parameters(2 TSRMLS_CC, "ls", &arg, &var, &var_len) == FAILURE) { return; @@ -174,23 +170,15 @@ PHP_FUNCTION(my_get_raw) break; } - if(!array_ptr) RETURN_FALSE; - - /* - * I'm changing the variable name here because when running with register_globals on, - * the variable will end up in the global symbol table - */ - raw_var = emalloc(var_len+5); /* RAW_ and a \0 */ - strcpy(raw_var, "RAW_"); - strlcat(raw_var,var,var_len+5); - hash_ptr = HASH_OF(array_ptr); + if(!array_ptr) { + RETURN_FALSE; + } - if(zend_hash_find(hash_ptr, raw_var, var_len+5, (void **)&tmp) == SUCCESS) { + if(zend_hash_find(HASH_OF(array_ptr), var, var_len+5, (void **)&tmp) == SUCCESS) { *return_value = **tmp; zval_copy_ctor(return_value); } else { RETVAL_FALSE; } - efree(raw_var); } diff --git a/Zend/tests/unset_cv06.phpt b/Zend/tests/unset_cv06.phpt index b1ef0cc2ac..dd788158e4 100644 --- a/Zend/tests/unset_cv06.phpt +++ b/Zend/tests/unset_cv06.phpt @@ -3,27 +3,20 @@ unset() CV 6 (indirect unset() of global variable in session_unset()) --SKIPIF-- --INI-- -register_globals=1 session.auto_start=0 session.save_handler=files --FILE-- --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP %d.%d and greater in Unknown on line 0 1 -Deprecated: Function session_register() is deprecated in %s on line %d -2 - -Notice: Undefined variable: x in %sunset_cv06.php on line %d +Notice: Undefined index: x in %sunset_cv06.php on line %d ok diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 82708dda3b..b64c6bd652 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -450,8 +450,6 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int orig_var = estrdup(var); /* Store the RAW variable internally */ - /* FIXME: Should not use php_register_variable_ex as that also registers - * globals when register_globals is turned on */ Z_STRLEN(raw_var) = val_len; Z_STRVAL(raw_var) = estrndup(*val, val_len); Z_TYPE(raw_var) = IS_STRING; @@ -461,8 +459,6 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int if (val_len) { /* Register mangled variable */ - /* FIXME: Should not use php_register_variable_ex as that also registers - * globals when register_globals is turned on */ Z_STRLEN(new_var) = val_len; Z_TYPE(new_var) = IS_STRING; @@ -537,7 +533,6 @@ static zval *php_filter_get_storage(long arg TSRMLS_DC)/* {{{ */ { zval *array_ptr = NULL; - zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_globals)); switch (arg) { case PARSE_GET: @@ -550,13 +545,13 @@ static zval *php_filter_get_storage(long arg TSRMLS_DC)/* {{{ */ array_ptr = IF_G(cookie_array); break; case PARSE_SERVER: - if (jit_initialization) { + if (PG(auto_globals_jit)) { zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); } array_ptr = IF_G(server_array); break; case PARSE_ENV: - if (jit_initialization) { + if (PG(auto_globals_jit)) { zend_is_auto_global("_ENV", sizeof("_ENV")-1 TSRMLS_CC); } array_ptr = IF_G(env_array); diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index b43aadbd45..c4bf0419d9 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -151,7 +151,6 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data) info.data_type = arg; info.separator = separator; - info.force_register_globals = 0; info.report_errors = 0; info.to_encoding = MBSTRG(internal_encoding); info.to_language = MBSTRG(language); @@ -210,13 +209,6 @@ enum mbfl_no_encoding _php_mb_encoding_handler_ex(const php_mb_encoding_handler_ mbfl_string_init_set(&resvar, info->to_language, info->to_encoding); mbfl_string_init_set(&resval, info->to_language, info->to_encoding); - /* register_globals stuff - * XXX: this feature is going to be deprecated? */ - - if (info->force_register_globals && !(prev_rg_state = PG(register_globals))) { - zend_alter_ini_entry("register_globals", sizeof("register_globals"), "1", sizeof("1")-1, PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME); - } - if (!res || *res == '\0') { goto out; } @@ -346,11 +338,6 @@ enum mbfl_no_encoding _php_mb_encoding_handler_ex(const php_mb_encoding_handler_ } out: - /* register_global stuff */ - if (info->force_register_globals && !prev_rg_state) { - zend_alter_ini_entry("register_globals", sizeof("register_globals"), "0", sizeof("0")-1, PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME); - } - if (convd != NULL) { MBSTRG(illegalchars) += mbfl_buffer_illegalchars(convd); mbfl_buffer_converter_delete(convd); @@ -376,7 +363,6 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler) info.data_type = PARSE_POST; info.separator = "&"; - info.force_register_globals = 0; info.report_errors = 0; info.to_encoding = MBSTRG(internal_encoding); info.to_language = MBSTRG(language); diff --git a/ext/mbstring/mb_gpc.h b/ext/mbstring/mb_gpc.h index 593b413253..83090c3bc9 100644 --- a/ext/mbstring/mb_gpc.h +++ b/ext/mbstring/mb_gpc.h @@ -32,7 +32,6 @@ typedef struct _php_mb_encoding_handler_info_t { int data_type; const char *separator; - unsigned int force_register_globals: 1; unsigned int report_errors: 1; enum mbfl_no_language to_language; enum mbfl_no_encoding to_encoding; diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index baa93983a3..1291ce2e2c 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1896,7 +1896,6 @@ PHP_FUNCTION(mb_parse_str) info.data_type = PARSE_STRING; info.separator = PG(arg_separator).input; - info.force_register_globals = (track_vars_array == NULL); info.report_errors = 1; info.to_encoding = MBSTRG(current_internal_encoding); info.to_language = MBSTRG(language); diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt index 8b320b0845..fcfbbd9fe4 100644 --- a/ext/mbstring/tests/mb_parse_str.phpt +++ b/ext/mbstring/tests/mb_parse_str.phpt @@ -4,7 +4,6 @@ mb_parse_str() --INI-- arg_separator.input=& -register_globals=0 --FILE-- --INI-- arg_separator.input=&# -register_globals=0 --FILE-- method(); $arr[3] = new foo; $arr[3]->method(); -session_register("baz"); -session_register("arr"); +session_start(); + +$_SESSION["baz"] = $baz; +$_SESSION["arr"] = $arr; print session_encode()."\n"; session_destroy(); ---EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 - -Deprecated: Function session_register() is deprecated in %s on line %d - -Deprecated: Function session_register() is deprecated in %s on line %d +--EXPECT-- baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}} diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt index 8a4e0027f8..03c3b95766 100644 --- a/ext/session/tests/003.phpt +++ b/ext/session/tests/003.phpt @@ -5,7 +5,6 @@ session object deserialization --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.serialize_handler=php session.save_handler=files --FILE-- @@ -21,14 +20,13 @@ session_id("abtest"); session_start(); session_decode('baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}'); -$baz->method(); -$arr[3]->method(); +$_SESSION["baz"]->method(); +$_SESSION["arr"][3]->method(); -var_dump($baz); -var_dump($arr); +var_dump($_SESSION["baz"]); +var_dump($_SESSION["arr"]); session_destroy(); --EXPECT-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 object(foo)#1 (2) { ["bar"]=> string(2) "ok" diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt index 2ff675e7cd..aeb2c8b363 100644 --- a/ext/session/tests/004.phpt +++ b/ext/session/tests/004.phpt @@ -5,7 +5,6 @@ session_set_save_handler test --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.name=PHPSESSID session.serialize_handler=php --FILE-- @@ -56,24 +55,23 @@ session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, session_id("abtest"); session_start(); -$baz->method(); -$arr[3]->method(); +$_SESSION["baz"]->method(); +$_SESSION["arr"][3]->method(); -var_dump($baz); -var_dump($arr); +var_dump($_SESSION["baz"]); +var_dump($_SESSION["arr"]); session_write_close(); session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, "read"), array($hnd, "write"), array($hnd, "destroy"), array($hnd, "gc")); session_start(); -var_dump($baz); -var_dump($arr); +var_dump($_SESSION["baz"]); +var_dump($_SESSION["arr"]); session_destroy(); ?> --EXPECT-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 OPEN: PHPSESSID READ: abtest object(foo)#2 (2) { @@ -94,7 +92,7 @@ array(1) { WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}} OPEN: PHPSESSID READ: abtest -object(foo)#4 (2) { +object(foo)#3 (2) { ["bar"]=> string(2) "ok" ["yes"]=> diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt index 124f0a831e..a970e6b71d 100644 --- a/ext/session/tests/005.phpt +++ b/ext/session/tests/005.phpt @@ -5,7 +5,6 @@ custom save handler, multiple session_start()s, complex data structure test. --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.name=PHPSESSID session.serialize_handler=php --FILE-- @@ -58,37 +57,41 @@ session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, session_id("abtest"); session_start(); -$baz->method(); -$arr[3]->method(); +session_decode($hnd->data); -var_dump($baz); -var_dump($arr); +$_SESSION["baz"]->method(); +$_SESSION["arr"][3]->method(); + +var_dump($_SESSION["baz"]); +var_dump($_SESSION["arr"]); session_write_close(); session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, "read"), array($hnd, "write"), array($hnd, "destroy"), array($hnd, "gc")); session_start(); -$baz->method(); -$arr[3]->method(); +$_SESSION["baz"]->method(); +$_SESSION["arr"][3]->method(); -$c = 123; -session_register("c"); -var_dump($baz); var_dump($arr); var_dump($c); +$_SESSION["c"] = 123; +var_dump($_SESSION["baz"]); +var_dump($_SESSION["arr"]); +var_dump($_SESSION["c"]); session_write_close(); session_set_save_handler(array($hnd, "open"), array($hnd, "close"), array($hnd, "read"), array($hnd, "write"), array($hnd, "destroy"), array($hnd, "gc")); session_start(); -var_dump($baz); var_dump($arr); var_dump($c); +var_dump($_SESSION["baz"]); +var_dump($_SESSION["arr"]); +var_dump($_SESSION["c"]); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 OPEN: PHPSESSID READ: abtest -object(foo)#2 (2) { +object(foo)#4 (2) { ["bar"]=> string(2) "ok" ["yes"]=> @@ -96,7 +99,7 @@ object(foo)#2 (2) { } array(1) { [3]=> - object(foo)#3 (2) { + object(foo)#2 (2) { ["bar"]=> string(2) "ok" ["yes"]=> @@ -107,9 +110,7 @@ WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O CLOSE OPEN: PHPSESSID READ: abtest - -Deprecated: Function session_register() is deprecated in %s on line %d -object(foo)#4 (2) { +object(foo)#2 (2) { ["bar"]=> string(2) "ok" ["yes"]=> @@ -117,7 +118,7 @@ object(foo)#4 (2) { } array(1) { [3]=> - object(foo)#2 (2) { + object(foo)#4 (2) { ["bar"]=> string(2) "ok" ["yes"]=> @@ -129,7 +130,7 @@ WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:3;}arr|a:1:{i:3;O CLOSE OPEN: PHPSESSID READ: abtest -object(foo)#3 (2) { +object(foo)#4 (2) { ["bar"]=> string(2) "ok" ["yes"]=> @@ -137,7 +138,7 @@ object(foo)#3 (2) { } array(1) { [3]=> - object(foo)#4 (2) { + object(foo)#2 (2) { ["bar"]=> string(2) "ok" ["yes"]=> diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt index 7c7af61b73..03fca10381 100644 --- a/ext/session/tests/006.phpt +++ b/ext/session/tests/006.phpt @@ -5,7 +5,6 @@ correct instantiation of references between variables in sessions --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.serialize_handler=php session.save_handler=files --FILE-- @@ -32,12 +31,11 @@ $b = new b($a); echo "original values:\n"; var_dump($a,$b); -session_register("a"); -session_register("b"); +$_SESSION["a"] = $a; +$_SESSION["b"] = $b; session_write_close(); -session_unregister("a"); -session_unregister("b"); +unset($_SESSION["a"], $_SESSION["b"]); session_start(); @@ -45,7 +43,6 @@ echo "values after session:\n"; var_dump($a,$b); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 original values: object(a)#%d (1) { ["test"]=> @@ -58,14 +55,6 @@ object(b)#%d (1) { string(5) "hallo" } } - -Deprecated: Function session_register() is deprecated in %s on line %d - -Deprecated: Function session_register() is deprecated in %s on line %d - -Deprecated: Function session_unregister() is deprecated in %s on line %d - -Deprecated: Function session_unregister() is deprecated in %s on line %d values after session: object(a)#%d (1) { ["test"]=> @@ -78,4 +67,3 @@ object(b)#%d (1) { string(5) "hallo" } } - diff --git a/ext/session/tests/007.phpt b/ext/session/tests/007.phpt index 61fd0974e3..d17a1ff16e 100644 --- a/ext/session/tests/007.phpt +++ b/ext/session/tests/007.phpt @@ -1,11 +1,10 @@ --TEST-- bug compatibility: unset($c) with enabled register_globals --SKIPIF-- - + --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.bug_compat_42=1 session.serialize_handler=php session.save_handler=files diff --git a/ext/session/tests/008-php4.2.3.phpt b/ext/session/tests/008-php4.2.3.phpt deleted file mode 100644 index 2b712e9bdc..0000000000 --- a/ext/session/tests/008-php4.2.3.phpt +++ /dev/null @@ -1,71 +0,0 @@ ---TEST-- -bug compatibility: global is used albeit register_globals=0 ---SKIPIF-- -= 4.2.3"); -?> ---INI-- -session.use_cookies=0 -session.cache_limiter= -register_globals=0 -session.bug_compat_42=1 -session.bug_compat_warn=1 -track_errors=1 -log_errors=0 -html_errors=0 -display_errors=1 -error_reporting=2039; -session.serialize_handler=php -session.save_handler=files -precision=14 ---FILE-- - ---EXPECTF-- -NULL -session_write_close(): Your script possibly relies on a session side-effect which existed until PHP 4.2.3. Please be advised that the session extension does not consider global variables as a source of data, unless register_globals is enabled. You can disable this functionality and this warning by setting session.bug_compat_42 or session.bug_compat_warn to off, respectively -array(1) { - ["c"]=> - float(3.14) -} -NULL -array(1) { - ["c"]=> - float(3.14) -} - diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt index 17aab94a8f..02e6eb17b2 100644 --- a/ext/session/tests/009.phpt +++ b/ext/session/tests/009.phpt @@ -1,11 +1,10 @@ --TEST-- -unset($_SESSION["name"]); should work with register_globals=off +unset($_SESSION["name"]); test --SKIPIF-- --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=0 session.bug_compat_42=1 session.bug_compat_warn=0 session.serialize_handler=php diff --git a/ext/session/tests/010.phpt b/ext/session/tests/010.phpt index e1af8ce87f..9ece4e187b 100644 --- a/ext/session/tests/010.phpt +++ b/ext/session/tests/010.phpt @@ -5,7 +5,6 @@ $session_array = explode(";", session_encode()); should not segfault --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=0 session.bug_compat_42=1 session.bug_compat_warn=0 --FILE-- diff --git a/ext/session/tests/011.phpt b/ext/session/tests/011.phpt index 6aaa6bd797..809ee3fd3d 100644 --- a/ext/session/tests/011.phpt +++ b/ext/session/tests/011.phpt @@ -5,7 +5,6 @@ session_decode(); should not segfault --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=0 session.bug_compat_42=1 session.bug_compat_warn=0 --FILE-- diff --git a/ext/session/tests/012.phpt b/ext/session/tests/012.phpt index 32aeb29c11..4746b85be0 100644 --- a/ext/session/tests/012.phpt +++ b/ext/session/tests/012.phpt @@ -5,7 +5,6 @@ registering $_SESSION should not segfault --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.bug_compat_42=1 session.bug_compat_warn=0 session.serialize_handler=php @@ -18,7 +17,7 @@ error_reporting(E_ALL); session_id("abtest"); session_start(); -session_register("_SESSION"); +$_SESSION["_SESSION"] = Array(); $_SESSION = "kk"; session_write_close(); @@ -31,8 +30,5 @@ session_destroy(); print "I live\n"; ?> ---EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 - -Deprecated: Function session_register() is deprecated in %s on line %d +--EXPECT-- I live diff --git a/ext/session/tests/013.phpt b/ext/session/tests/013.phpt index ad6c14e13e..e67a115604 100644 --- a/ext/session/tests/013.phpt +++ b/ext/session/tests/013.phpt @@ -5,7 +5,6 @@ redefining SID should not cause warnings --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.bug_compat_42=1 session.bug_compat_warn=0 session.serialize_handler=php @@ -24,5 +23,4 @@ session_destroy(); print "I live\n"; ?> --EXPECT-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 I live diff --git a/ext/session/tests/014.phpt b/ext/session/tests/014.phpt index 4e77a7aeff..0c32dce510 100644 --- a/ext/session/tests/014.phpt +++ b/ext/session/tests/014.phpt @@ -3,10 +3,9 @@ a script should not be able to modify session.use_trans_sid --SKIPIF-- --INI-- -session.use_trans_sid=1 +session.use_trans_sid=0 session.use_cookies=0 session.cache_limiter= -register_globals=1 session.bug_compat_42=1 session.bug_compat_warn=0 session.name=PHPSESSID @@ -22,22 +21,21 @@ session_start(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 - + Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d - + Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d - + diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt index 5bdd03b5cf..e0b8256a59 100644 --- a/ext/session/tests/019.phpt +++ b/ext/session/tests/019.phpt @@ -5,7 +5,6 @@ serializing references test case using globals --INI-- session.use_cookies=0 session.cache_limiter= -register_globals=1 session.serialize_handler=php session.save_handler=files --FILE-- @@ -27,27 +26,26 @@ session_id("abtest"); session_start(); session_register('o1', 'o2' ); -$o1 = new TFoo(42); -$o2 =& $o1; +$_SESSION["o1"] = new TFoo(42); +$_SESSION["o2"] =& $_SESSION["o1"]; session_write_close(); -unset($o1); -unset($o2); +unset($_SESSION["o1"]); +unset($_SESSION["o2"]); session_start(); var_dump($_SESSION); -$o1->inc(); -$o2->inc(); +$_SESSION["o1"]->inc(); +$_SESSION["o2"]->inc(); var_dump($_SESSION); session_destroy(); ?> --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 Deprecated: Function session_register() is deprecated in %s on line %d array(2) { diff --git a/ext/session/tests/bug24592.phpt b/ext/session/tests/bug24592.phpt index 059125ba2e..9f6c395317 100644 --- a/ext/session/tests/bug24592.phpt +++ b/ext/session/tests/bug24592.phpt @@ -3,7 +3,6 @@ Bug #24592 (crash when multiple NULL values are being stored) --SKIPIF-- --INI-- -register_globals=0 html_errors=0 session.save_handler=files --FILE-- diff --git a/ext/session/tests/bug26862.phpt b/ext/session/tests/bug26862.phpt index 44e7418cd0..7990f74359 100644 --- a/ext/session/tests/bug26862.phpt +++ b/ext/session/tests/bug26862.phpt @@ -3,7 +3,6 @@ Bug #26862 (ob_flush() before output_reset_rewrite_vars() results in data loss) --SKIPIF-- --INI-- -register_globals=0 html_errors=0 session.use_trans_sid=0 session.save_handler=files diff --git a/ext/soap/TODO.old b/ext/soap/TODO.old index a1cc15c397..59deb4b9dc 100644 --- a/ext/soap/TODO.old +++ b/ext/soap/TODO.old @@ -6,7 +6,6 @@ make internal refrences for soap encoding (use seralization logic) add ini option for always soap_error_handler provide user space overriding of serialization certin objects and types serialization in general needs to be polished/finished... all xsd types -make perstistant objects and work with or without register_globals on look to see if php-soap will work with out always_populate_raw_post_data on see if client will work with ssl.. should be eaiser with php_streams work on soap seralizer (php serialization) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt index 31bcb80fc3..c22fdd0d16 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt @@ -4,17 +4,17 @@ Test function get_cfg_var() by calling deprecated option Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 --INI-- -register_globals=1 +safe_mode=1 --SKIPIF-- --FILE-- --EXPECTF-- -Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0 +Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line 0 *** Test by calling method or function with deprecated option *** string(1) "1" diff --git a/ext/standard/tests/general_functions/import_request.phpt b/ext/standard/tests/general_functions/import_request.phpt index 0f9e93bf0c..0067632391 100644 --- a/ext/standard/tests/general_functions/import_request.phpt +++ b/ext/standard/tests/general_functions/import_request.phpt @@ -4,8 +4,6 @@ import_request_variables() tests a=1&b=heh&c=3&d[]=5&GLOBALS=test&1=hm --POST-- ap=25&bp=test&cp=blah3&dp[]=ar ---INI-- -register_globals=0 --FILE-- value.ht; - } else if (PG(register_globals)) { - /* should never happen nowadays */ - symbol_table = EG(active_symbol_table); } else { symbol_table = NULL; } diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 33d20969be..aaedb69b80 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -403,9 +403,6 @@ static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_ /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */ if (track_vars_array) { symbol_table = track_vars_array->value.ht; - } else if (PG(register_globals)) { - /* should never happen nowadays */ - symbol_table = EG(active_symbol_table); } else { symbol_table = NULL; } diff --git a/sapi/apache_hooks/sapi_apache.c b/sapi/apache_hooks/sapi_apache.c index 5c9fbb7816..b7fd658eb5 100644 --- a/sapi/apache_hooks/sapi_apache.c +++ b/sapi/apache_hooks/sapi_apache.c @@ -78,13 +78,9 @@ int apache_php_module_hook(request_rec *r, php_handler *handler, zval **ret TSRM return FAILURE; } - req = php_apache_request_new(r); - if(PG(register_globals)) { - php_register_variable_ex("request", req, NULL TSRMLS_CC); - } - else { - php_register_variable_ex("request", req, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); - } + req = php_apache_request_new(r); + php_register_variable_ex("request", req, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); + switch(handler->type) { case AP_HANDLER_TYPE_FILE: php_register_variable("PHP_SELF_HOOK", handler->name, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); diff --git a/sapi/cli/README b/sapi/cli/README index 9e519e9bd0..8720250f6a 100644 --- a/sapi/cli/README +++ b/sapi/cli/README @@ -11,8 +11,8 @@ The main differences between the two: * It does not change the working directory to that of the script. (-C switch kept for compatibility) * Plain text error message -* $argc and $argv registered irrespective of register_globals - and register_argc_argv php.ini settings. +* $argc and $argv registered irrespective of the register_argc_argv + php.ini setting. * implicit_flush always on * -r option which allows execution of PHP code directly from the command line (e.g. php -r 'echo md5("test");' ) diff --git a/tests/basic/011.phpt b/tests/basic/011.phpt index 2ec7a6ed12..79256746fe 100644 --- a/tests/basic/011.phpt +++ b/tests/basic/011.phpt @@ -6,11 +6,8 @@ register_argc_argv=1 ab+cd+ef+123+test --FILE-- = 4.3.3) @@ -1436,7 +1428,7 @@ The configuration file ; Boolean values can be set to either: ; true, on, yes ; or false, off, no, none -register_globals = off +html_errors = off track_errors = yes ; you can enclose strings in double-quotes