cvs: php-src / NEWS /ext/pcre/tests bug33200.phpt /ext/session session.c /ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt 009.phpt 016.phpt
/main main.c php_globals.h php_variables.c ZendEngine2/tests unset_cv05.phpt
| From: | Dmitry Stogov | Date: | Thu, 16 Mar 2006 09:44:42 +0000 |
| Subject: | cvs: php-src / NEWS /ext/pcre/tests bug33200.phpt /ext/session session.c /ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt 009.phpt 016.phpt /main main.c php_globals.h php_variables.c ZendEngine2/tests unset_cv05.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37295@lists.php.net to get a copy of this message | ||
dmitry Thu Mar 16 09:44:42 2006 UTC
Modified files:
/php-src NEWS
/ZendEngine2/tests unset_cv05.phpt
/php-src/ext/pcre/tests bug33200.phpt
/php-src/ext/session session.c
/php-src/ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt
009.phpt 016.phpt
/php-src/main main.c php_globals.h php_variables.c
Log:
Dropped register_long_arrays, added E_CORE for all dropped setting
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2100&r2=1.2101&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2100 php-src/NEWS:1.2101 --- php-src/NEWS:1.2100 Fri Mar 10 08:29:22 2006 +++ php-src/NEWS Thu Mar 16 09:44:41 2006 @@ -3,6 +3,7 @@ ?? ??? ????, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) - Dropped safe_mode support (Ilia, Andi) +- Dropped register_long_arrays (Dmitry) - Droped register_globals support (Pierre) - session_register, session_unregister and session_is_registered removed they depend on register_globals http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/unset_cv05.phpt?r1=1.4&r2=1.5&diff_format=u Index: ZendEngine2/tests/unset_cv05.phpt diff -u ZendEngine2/tests/unset_cv05.phpt:1.4 ZendEngine2/tests/unset_cv05.phpt:1.5 --- ZendEngine2/tests/unset_cv05.phpt:1.4 Fri Jul 8 07:57:47 2005 +++ ZendEngine2/tests/unset_cv05.phpt Thu Mar 16 09:44:41 2006 @@ -1,21 +1,16 @@ --TEST-- unset() CV 5 (indirect unset() of global variable in session_start()) --INI-- -register_long_arrays=1 session.auto_start=0 session.save_handler=files --SKIPIF-- -<?php - -include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); - -?> +<?php include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); ?> --FILE-- <?php -$HTTP_SESSION_VARS = "ok\n"; -echo $HTTP_SESSION_VARS; +$_SESSION = "ok\n"; +echo $_SESSION; session_start(); -echo $HTTP_SESSION_VARS; +echo $_SESSION; echo "\nok\n"; ?> --EXPECTF-- http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/tests/bug33200.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/bug33200.phpt diff -u php-src/ext/pcre/tests/bug33200.phpt:1.2 php-src/ext/pcre/tests/bug33200.phpt:1.3 --- php-src/ext/pcre/tests/bug33200.phpt:1.2 Wed Mar 8 00:43:28 2006 +++ php-src/ext/pcre/tests/bug33200.phpt Thu Mar 16 09:44:41 2006 @@ -2,8 +2,6 @@ Bug #33200 (magic_quotes_sybase = On makes 'e' modifier misbehave) --SKIPIF-- die('skip magic_quotes removed'); ---INI-- -magic_quotes_sybase=1 --FILE-- <?php $str = 'some \'$sample\' text'; http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.431&r2=1.432&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.431 php-src/ext/session/session.c:1.432 --- php-src/ext/session/session.c:1.431 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/session.c Thu Mar 16 09:44:41 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.431 2006/03/07 00:20:53 pajoye Exp $ */ +/* $Id: session.c,v 1.432 2006/03/16 09:44:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -466,13 +466,7 @@ array_init(session_vars); PS(http_session_vars) = session_vars; - if (PG(register_long_arrays)) { - ZEND_SET_GLOBAL_VAR_WITH_LENGTH("HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), PS(http_session_vars), 2, 1); - ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 2, 1); - } - else { - ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 1, 0); - } + ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 1, 0); } static char *php_session_encode(int *newlen TSRMLS_DC) http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/007.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/session/tests/007.phpt diff -u php-src/ext/session/tests/007.phpt:1.10 php-src/ext/session/tests/007.phpt:1.11 --- php-src/ext/session/tests/007.phpt:1.10 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/007.phpt Thu Mar 16 09:44:41 2006 @@ -3,7 +3,6 @@ --SKIPIF-- <?php die('skip');/* RG removed */ ?> --INI-- -register_long_arrays=1 session.use_cookies=0 session.cache_limiter= session.bug_compat_42=1 @@ -19,26 +18,26 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); $_SESSION['c'] = $c; unset($c); $c = 3.14; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); $c = $_SESSION['c']; var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); unset($c); $c = 2.78; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); ### Phase 4 final @@ -46,7 +45,7 @@ session_start(); $c = $_SESSION['c']; var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/008-php4.2.3.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/session/tests/008-php4.2.3.phpt diff -u php-src/ext/session/tests/008-php4.2.3.phpt:1.8 php-src/ext/session/tests/008-php4.2.3.phpt:1.9 --- php-src/ext/session/tests/008-php4.2.3.phpt:1.8 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/008-php4.2.3.phpt Thu Mar 16 09:44:41 2006 @@ -6,7 +6,6 @@ if (version_compare(PHP_VERSION,"4.2.3-dev", "<")) die("skip this is for PHP >= 4.2.3"); ?> --INI-- -register_long_arrays=1 session.use_cookies=0 session.cache_limiter= session.bug_compat_42=1 @@ -25,7 +24,7 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); $_SESSION['c'] = NULL; $c = $_SESSION['c']; @@ -35,18 +34,18 @@ @session_write_close(); // this generates an E_WARNING which will be printed // by $php_errormsg so we can use "@" here. ANY further message IS an error. echo $php_errormsg."\n"; -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); $c = $_SESSION['c']; -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); unset($c); $c = 2.78; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); ### Phase 4 final @@ -54,7 +53,7 @@ session_start(); $c = $_SESSION['c']; var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/008.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/session/tests/008.phpt diff -u php-src/ext/session/tests/008.phpt:1.8 php-src/ext/session/tests/008.phpt:1.9 --- php-src/ext/session/tests/008.phpt:1.8 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/008.phpt Thu Mar 16 09:44:41 2006 @@ -19,31 +19,31 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); session_register("c"); var_dump($c); unset($c); $c = 3.14; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); unset($c); $c = 2.78; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); ### Phase 4 final session_start(); var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/009.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/session/tests/009.phpt diff -u php-src/ext/session/tests/009.phpt:1.6 php-src/ext/session/tests/009.phpt:1.7 --- php-src/ext/session/tests/009.phpt:1.6 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/009.phpt Thu Mar 16 09:44:41 2006 @@ -3,7 +3,6 @@ --SKIPIF-- <?php include('skipif.inc'); ?> --INI-- -register_long_arrays=1 session.use_cookies=0 session.cache_limiter= session.bug_compat_42=1 @@ -20,25 +19,25 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); session_start(); -var_dump($HTTP_SESSION_VARS); -$HTTP_SESSION_VARS["name"] = "foo"; -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); +$_SESSION["name"] = "foo"; +var_dump($_SESSION); session_write_close(); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); -var_dump($HTTP_SESSION_VARS); -unset($HTTP_SESSION_VARS["name"]); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); +unset($_SESSION["name"]); +var_dump($_SESSION); session_write_close(); ### Phase 4 final session_start(); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> --EXPECT-- http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/016.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/session/tests/016.phpt diff -u php-src/ext/session/tests/016.phpt:1.3 php-src/ext/session/tests/016.phpt:1.4 --- php-src/ext/session/tests/016.phpt:1.3 Wed Jul 2 04:34:18 2003 +++ php-src/ext/session/tests/016.phpt Thu Mar 16 09:44:41 2006 @@ -13,7 +13,7 @@ error_reporting(E_ALL); @session_start(); -$HTTP_SESSION_VARS["test"] = 1; +$_SESSION["test"] = 1; @session_write_close(); print "I live\n"; ?> http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.674&r2=1.675&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.674 php-src/main/main.c:1.675 --- php-src/main/main.c:1.674 Tue Mar 14 15:16:27 2006 +++ php-src/main/main.c Thu Mar 16 09:44:41 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.674 2006/03/14 15:16:27 dmitry Exp $ */ +/* $Id: main.c,v 1.675 2006/03/16 09:44:41 dmitry Exp $ */ /* {{{ includes */ @@ -372,7 +372,6 @@ STD_PHP_INI_ENTRY("output_buffering", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateLong, output_buffering, php_core_globals, core_globals) STD_PHP_INI_ENTRY("output_handler", NULL, PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, output_handler, php_core_globals, core_globals) 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_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) STD_PHP_INI_BOOLEAN("short_open_tag", DEFAULT_SHORT_OPEN_TAG, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) @@ -425,6 +424,7 @@ STD_PHP_INI_BOOLEAN("always_populate_raw_post_data", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, always_populate_raw_post_data, php_core_globals, core_globals) STD_PHP_INI_ENTRY("realpath_cache_size", "16K", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals) STD_PHP_INI_ENTRY("realpath_cache_ttl", "120", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_ttl, virtual_cwd_globals, cwd_globals) + PHP_INI_END() /* }}} */ @@ -1569,6 +1569,27 @@ return FAILURE; } + /* Check for deprecated directives */ + { + static const char *directives[] = { + "register_globals", + "register_long_arrays", + "safe_mode", + "magic_quotes_gpc", + "magic_quotes_runtime", + "magic_quotes_sybase", + NULL}; + const char **p = directives; + long val; + + while (*p) { + if (cfg_get_long(*p, &val) == SUCCESS && val) { + zend_error(E_CORE_ERROR, "Directive '%s' is not longer supported in PHP-6 and above", *p); + } + ++p; + } + } + /* Register PHP core ini entries */ REGISTER_INI_ENTRIES(); http://cvs.php.net/viewcvs.cgi/php-src/main/php_globals.h?r1=1.103&r2=1.104&diff_format=u Index: php-src/main/php_globals.h diff -u php-src/main/php_globals.h:1.103 php-src/main/php_globals.h:1.104 --- php-src/main/php_globals.h:1.103 Wed Mar 8 14:41:45 2006 +++ php-src/main/php_globals.h Thu Mar 16 09:44:41 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_globals.h,v 1.103 2006/03/08 14:41:45 iliaa Exp $ */ +/* $Id: php_globals.h,v 1.104 2006/03/16 09:44:41 dmitry Exp $ */ #ifndef PHP_GLOBALS_H #define PHP_GLOBALS_H @@ -108,7 +108,6 @@ zend_bool expose_php; - zend_bool register_long_arrays; zend_bool register_argc_argv; zend_bool auto_globals_jit; http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.119&r2=1.120&diff_format=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.119 php-src/main/php_variables.c:1.120 --- php-src/main/php_variables.c:1.119 Wed Mar 8 00:43:29 2006 +++ php-src/main/php_variables.c Thu Mar 16 09:44:42 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.119 2006/03/08 00:43:29 pajoye Exp $ */ +/* $Id: php_variables.c,v 1.120 2006/03/16 09:44:42 dmitry Exp $ */ #include <stdio.h> #include "php.h" @@ -818,20 +818,18 @@ 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(auto_globals_jit) && !PG(register_long_arrays) && !PG(register_argc_argv)); + zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_argc_argv)); struct auto_global_record { char *name; uint name_len; - char *long_name; - uint long_name_len; zend_bool jit_initialization; } auto_global_records[] = { - { "_POST", sizeof("_POST"), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), 0 }, - { "_GET", sizeof("_GET"), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), 0 }, - { "_COOKIE", sizeof("_COOKIE"), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), 0 }, - { "_SERVER", sizeof("_SERVER"), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), 1 }, - { "_ENV", sizeof("_ENV"), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), 1 }, - { "_FILES", sizeof("_FILES"), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), 0 }, + { "_POST", sizeof("_POST"), 0 }, + { "_GET", sizeof("_GET"), 0 }, + { "_COOKIE", sizeof("_COOKIE"), 0 }, + { "_SERVER", sizeof("_SERVER"), 1 }, + { "_ENV", sizeof("_ENV"), 1 }, + { "_FILES", sizeof("_FILES"), 0 }, }; size_t num_track_vars = sizeof(auto_global_records)/sizeof(struct auto_global_record); size_t i; @@ -906,10 +904,6 @@ PG(http_globals)[i]->refcount++; zend_hash_update(&EG(symbol_table), auto_global_records[i].name, auto_global_records[i].name_len, &PG(http_globals)[i], sizeof(zval *), NULL); - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), auto_global_records[i].long_name, auto_global_records[i].long_name_len, &PG(http_globals)[i], sizeof(zval *), NULL); - PG(http_globals)[i]->refcount++; - } } /* Create _REQUEST */ @@ -940,11 +934,6 @@ zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL); PG(http_globals)[TRACK_VARS_SERVER]->refcount++; - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL); - PG(http_globals)[TRACK_VARS_SERVER]->refcount++; - } - return 0; /* don't rearm */ } @@ -966,11 +955,6 @@ zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL); PG(http_globals)[TRACK_VARS_ENV]->refcount++; - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL); - PG(http_globals)[TRACK_VARS_ENV]->refcount++; - } - return 0; /* don't rearm */ }
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2100&r2=1.2101&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2100 php-src/NEWS:1.2101 --- php-src/NEWS:1.2100 Fri Mar 10 08:29:22 2006 +++ php-src/NEWS Thu Mar 16 09:44:41 2006 @@ -3,6 +3,7 @@ ?? ??? ????, PHP 6.0 - Unicode support. (Andrei, Dmitry, et al) - Dropped safe_mode support (Ilia, Andi) +- Dropped register_long_arrays (Dmitry) - Droped register_globals support (Pierre) - session_register, session_unregister and session_is_registered removed they depend on register_globals http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/unset_cv05.phpt?r1=1.4&r2=1.5&diff_format=u Index: ZendEngine2/tests/unset_cv05.phpt diff -u ZendEngine2/tests/unset_cv05.phpt:1.4 ZendEngine2/tests/unset_cv05.phpt:1.5 --- ZendEngine2/tests/unset_cv05.phpt:1.4 Fri Jul 8 07:57:47 2005 +++ ZendEngine2/tests/unset_cv05.phpt Thu Mar 16 09:44:41 2006 @@ -1,21 +1,16 @@ --TEST-- unset() CV 5 (indirect unset() of global variable in session_start()) --INI-- -register_long_arrays=1 session.auto_start=0 session.save_handler=files --SKIPIF-- -<?php - -include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); - -?> +<?php include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); ?> --FILE-- <?php -$HTTP_SESSION_VARS = "ok\n"; -echo $HTTP_SESSION_VARS; +$_SESSION = "ok\n"; +echo $_SESSION; session_start(); -echo $HTTP_SESSION_VARS; +echo $_SESSION; echo "\nok\n"; ?> --EXPECTF-- http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/tests/bug33200.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/bug33200.phpt diff -u php-src/ext/pcre/tests/bug33200.phpt:1.2 php-src/ext/pcre/tests/bug33200.phpt:1.3 --- php-src/ext/pcre/tests/bug33200.phpt:1.2 Wed Mar 8 00:43:28 2006 +++ php-src/ext/pcre/tests/bug33200.phpt Thu Mar 16 09:44:41 2006 @@ -2,8 +2,6 @@ Bug #33200 (magic_quotes_sybase = On makes 'e' modifier misbehave) --SKIPIF-- die('skip magic_quotes removed'); ---INI-- -magic_quotes_sybase=1 --FILE-- <?php $str = 'some \'$sample\' text'; http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.431&r2=1.432&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.431 php-src/ext/session/session.c:1.432 --- php-src/ext/session/session.c:1.431 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/session.c Thu Mar 16 09:44:41 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.431 2006/03/07 00:20:53 pajoye Exp $ */ +/* $Id: session.c,v 1.432 2006/03/16 09:44:41 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -466,13 +466,7 @@ array_init(session_vars); PS(http_session_vars) = session_vars; - if (PG(register_long_arrays)) { - ZEND_SET_GLOBAL_VAR_WITH_LENGTH("HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), PS(http_session_vars), 2, 1); - ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 2, 1); - } - else { - ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 1, 0); - } + ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"), PS(http_session_vars), 1, 0); } static char *php_session_encode(int *newlen TSRMLS_DC) http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/007.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/session/tests/007.phpt diff -u php-src/ext/session/tests/007.phpt:1.10 php-src/ext/session/tests/007.phpt:1.11 --- php-src/ext/session/tests/007.phpt:1.10 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/007.phpt Thu Mar 16 09:44:41 2006 @@ -3,7 +3,6 @@ --SKIPIF-- <?php die('skip');/* RG removed */ ?> --INI-- -register_long_arrays=1 session.use_cookies=0 session.cache_limiter= session.bug_compat_42=1 @@ -19,26 +18,26 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); $_SESSION['c'] = $c; unset($c); $c = 3.14; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); $c = $_SESSION['c']; var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); unset($c); $c = 2.78; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); ### Phase 4 final @@ -46,7 +45,7 @@ session_start(); $c = $_SESSION['c']; var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/008-php4.2.3.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/session/tests/008-php4.2.3.phpt diff -u php-src/ext/session/tests/008-php4.2.3.phpt:1.8 php-src/ext/session/tests/008-php4.2.3.phpt:1.9 --- php-src/ext/session/tests/008-php4.2.3.phpt:1.8 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/008-php4.2.3.phpt Thu Mar 16 09:44:41 2006 @@ -6,7 +6,6 @@ if (version_compare(PHP_VERSION,"4.2.3-dev", "<")) die("skip this is for PHP >= 4.2.3"); ?> --INI-- -register_long_arrays=1 session.use_cookies=0 session.cache_limiter= session.bug_compat_42=1 @@ -25,7 +24,7 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); $_SESSION['c'] = NULL; $c = $_SESSION['c']; @@ -35,18 +34,18 @@ @session_write_close(); // this generates an E_WARNING which will be printed // by $php_errormsg so we can use "@" here. ANY further message IS an error. echo $php_errormsg."\n"; -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); $c = $_SESSION['c']; -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); unset($c); $c = 2.78; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); ### Phase 4 final @@ -54,7 +53,7 @@ session_start(); $c = $_SESSION['c']; var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/008.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/session/tests/008.phpt diff -u php-src/ext/session/tests/008.phpt:1.8 php-src/ext/session/tests/008.phpt:1.9 --- php-src/ext/session/tests/008.phpt:1.8 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/008.phpt Thu Mar 16 09:44:41 2006 @@ -19,31 +19,31 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); session_register("c"); var_dump($c); unset($c); $c = 3.14; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); unset($c); $c = 2.78; session_write_close(); -unset($HTTP_SESSION_VARS); +unset($_SESSION); unset($c); ### Phase 4 final session_start(); var_dump($c); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/009.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/session/tests/009.phpt diff -u php-src/ext/session/tests/009.phpt:1.6 php-src/ext/session/tests/009.phpt:1.7 --- php-src/ext/session/tests/009.phpt:1.6 Tue Mar 7 00:20:53 2006 +++ php-src/ext/session/tests/009.phpt Thu Mar 16 09:44:41 2006 @@ -3,7 +3,6 @@ --SKIPIF-- <?php include('skipif.inc'); ?> --INI-- -register_long_arrays=1 session.use_cookies=0 session.cache_limiter= session.bug_compat_42=1 @@ -20,25 +19,25 @@ session_start(); session_destroy(); -### Phase 2 $HTTP_SESSION_VARS["c"] does not contain any value +### Phase 2 $_SESSION["c"] does not contain any value session_id("abtest"); session_start(); -var_dump($HTTP_SESSION_VARS); -$HTTP_SESSION_VARS["name"] = "foo"; -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); +$_SESSION["name"] = "foo"; +var_dump($_SESSION); session_write_close(); -### Phase 3 $HTTP_SESSION_VARS["c"] is set +### Phase 3 $_SESSION["c"] is set session_start(); -var_dump($HTTP_SESSION_VARS); -unset($HTTP_SESSION_VARS["name"]); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); +unset($_SESSION["name"]); +var_dump($_SESSION); session_write_close(); ### Phase 4 final session_start(); -var_dump($HTTP_SESSION_VARS); +var_dump($_SESSION); session_destroy(); ?> --EXPECT-- http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/016.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/session/tests/016.phpt diff -u php-src/ext/session/tests/016.phpt:1.3 php-src/ext/session/tests/016.phpt:1.4 --- php-src/ext/session/tests/016.phpt:1.3 Wed Jul 2 04:34:18 2003 +++ php-src/ext/session/tests/016.phpt Thu Mar 16 09:44:41 2006 @@ -13,7 +13,7 @@ error_reporting(E_ALL); @session_start(); -$HTTP_SESSION_VARS["test"] = 1; +$_SESSION["test"] = 1; @session_write_close(); print "I live\n"; ?> http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.674&r2=1.675&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.674 php-src/main/main.c:1.675 --- php-src/main/main.c:1.674 Tue Mar 14 15:16:27 2006 +++ php-src/main/main.c Thu Mar 16 09:44:41 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.674 2006/03/14 15:16:27 dmitry Exp $ */ +/* $Id: main.c,v 1.675 2006/03/16 09:44:41 dmitry Exp $ */ /* {{{ includes */ @@ -372,7 +372,6 @@ STD_PHP_INI_ENTRY("output_buffering", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateLong, output_buffering, php_core_globals, core_globals) STD_PHP_INI_ENTRY("output_handler", NULL, PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, output_handler, php_core_globals, core_globals) 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_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) STD_PHP_INI_BOOLEAN("short_open_tag", DEFAULT_SHORT_OPEN_TAG, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) @@ -425,6 +424,7 @@ STD_PHP_INI_BOOLEAN("always_populate_raw_post_data", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, always_populate_raw_post_data, php_core_globals, core_globals) STD_PHP_INI_ENTRY("realpath_cache_size", "16K", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals) STD_PHP_INI_ENTRY("realpath_cache_ttl", "120", PHP_INI_SYSTEM, OnUpdateLong, realpath_cache_ttl, virtual_cwd_globals, cwd_globals) + PHP_INI_END() /* }}} */ @@ -1569,6 +1569,27 @@ return FAILURE; } + /* Check for deprecated directives */ + { + static const char *directives[] = { + "register_globals", + "register_long_arrays", + "safe_mode", + "magic_quotes_gpc", + "magic_quotes_runtime", + "magic_quotes_sybase", + NULL}; + const char **p = directives; + long val; + + while (*p) { + if (cfg_get_long(*p, &val) == SUCCESS && val) { + zend_error(E_CORE_ERROR, "Directive '%s' is not longer supported in PHP-6 and above", *p); + } + ++p; + } + } + /* Register PHP core ini entries */ REGISTER_INI_ENTRIES(); http://cvs.php.net/viewcvs.cgi/php-src/main/php_globals.h?r1=1.103&r2=1.104&diff_format=u Index: php-src/main/php_globals.h diff -u php-src/main/php_globals.h:1.103 php-src/main/php_globals.h:1.104 --- php-src/main/php_globals.h:1.103 Wed Mar 8 14:41:45 2006 +++ php-src/main/php_globals.h Thu Mar 16 09:44:41 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_globals.h,v 1.103 2006/03/08 14:41:45 iliaa Exp $ */ +/* $Id: php_globals.h,v 1.104 2006/03/16 09:44:41 dmitry Exp $ */ #ifndef PHP_GLOBALS_H #define PHP_GLOBALS_H @@ -108,7 +108,6 @@ zend_bool expose_php; - zend_bool register_long_arrays; zend_bool register_argc_argv; zend_bool auto_globals_jit; http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.119&r2=1.120&diff_format=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.119 php-src/main/php_variables.c:1.120 --- php-src/main/php_variables.c:1.119 Wed Mar 8 00:43:29 2006 +++ php-src/main/php_variables.c Thu Mar 16 09:44:42 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.119 2006/03/08 00:43:29 pajoye Exp $ */ +/* $Id: php_variables.c,v 1.120 2006/03/16 09:44:42 dmitry Exp $ */ #include <stdio.h> #include "php.h" @@ -818,20 +818,18 @@ 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(auto_globals_jit) && !PG(register_long_arrays) && !PG(register_argc_argv)); + zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_argc_argv)); struct auto_global_record { char *name; uint name_len; - char *long_name; - uint long_name_len; zend_bool jit_initialization; } auto_global_records[] = { - { "_POST", sizeof("_POST"), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), 0 }, - { "_GET", sizeof("_GET"), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), 0 }, - { "_COOKIE", sizeof("_COOKIE"), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), 0 }, - { "_SERVER", sizeof("_SERVER"), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), 1 }, - { "_ENV", sizeof("_ENV"), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), 1 }, - { "_FILES", sizeof("_FILES"), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), 0 }, + { "_POST", sizeof("_POST"), 0 }, + { "_GET", sizeof("_GET"), 0 }, + { "_COOKIE", sizeof("_COOKIE"), 0 }, + { "_SERVER", sizeof("_SERVER"), 1 }, + { "_ENV", sizeof("_ENV"), 1 }, + { "_FILES", sizeof("_FILES"), 0 }, }; size_t num_track_vars = sizeof(auto_global_records)/sizeof(struct auto_global_record); size_t i; @@ -906,10 +904,6 @@ PG(http_globals)[i]->refcount++; zend_hash_update(&EG(symbol_table), auto_global_records[i].name, auto_global_records[i].name_len, &PG(http_globals)[i], sizeof(zval *), NULL); - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), auto_global_records[i].long_name, auto_global_records[i].long_name_len, &PG(http_globals)[i], sizeof(zval *), NULL); - PG(http_globals)[i]->refcount++; - } } /* Create _REQUEST */ @@ -940,11 +934,6 @@ zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL); PG(http_globals)[TRACK_VARS_SERVER]->refcount++; - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL); - PG(http_globals)[TRACK_VARS_SERVER]->refcount++; - } - return 0; /* don't rearm */ } @@ -966,11 +955,6 @@ zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL); PG(http_globals)[TRACK_VARS_ENV]->refcount++; - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL); - PG(http_globals)[TRACK_VARS_ENV]->refcount++; - } - return 0; /* don't rearm */ }