cvs: php4 / NEWS /main main.c

zeev Wed Aug 8 14:26:04 2001 EDT Modified files: /php4 NEWS /php4/main main.c Log: - Fix precedence of the variables order in $_FORM - Rename $_FORM to $_REQUEST for now Index: php4/NEWS diff -u php4/NEWS:1.728 php4/NEWS:1.729 --- php4/NEWS:1.728 Wed Aug 8 13:16:19 2001 +++ php4/NEWS Wed Aug 8 14:25:59 2001 @@ -1,7 +1,7 @@ PHP 4.0 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 200?, Version 4.0.7-dev -- Introduced a new $_FORM variable, which includes any GET, POST or COOKIE +- Introduced a new $_REQUEST array, which includes any GET, POST or COOKIE variables. Like the other new variables, this variable is also available regardless of the context. (Andi & Zeev) - Introduced $_GET, $_POST, $_COOKIE, $_SERVER and $_ENV variables, which Index: php4/main/main.c diff -u php4/main/main.c:1.400 php4/main/main.c:1.401 --- php4/main/main.c:1.400 Wed Aug 8 13:16:20 2001 +++ php4/main/main.c Wed Aug 8 14:26:03 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.400 2001/08/08 17:16:20 zeev Exp $ */ +/* $Id: main.c,v 1.401 2001/08/08 18:26:03 zeev Exp $ */ /* {{{ includes */ @@ -894,7 +894,7 @@ for (i=0; i<6; i++) { zend_register_auto_global(short_track_vars_names[i], short_track_vars_names_length[i]-1 TSRMLS_CC); } - zend_register_auto_global("_FORM", sizeof("_FORM")-1 TSRMLS_CC); + zend_register_auto_global("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC); zend_set_utility_values(&zuv); php_startup_sapi_content_types(); @@ -1146,20 +1146,21 @@ switch (*p) { case 'g': case 'G': - zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 0); + zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 1); + zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_FILES]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 1); break; case 'p': case 'P': - zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 0); + zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 1); break; case 'c': case 'C': - zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 0); + zend_hash_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]), (void (*)(void *pData)) zval_add_ref, NULL, sizeof(zval *), 1); break; } } - zend_hash_update(&EG(symbol_table), "_FORM", sizeof("_FORM"), &form_variables, sizeof(zval *), NULL); + zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL); } return SUCCESS;