diff options
| author | Zeev Suraski <zeev@php.net> | 2001-08-08 18:26:03 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-08-08 18:26:03 +0000 |
| commit | 6fdf6b4c82d2c752ce11f8e5441428e960f338eb (patch) | |
| tree | e00ffaede764848e7a4a1825fbc01e2174d0af25 /main | |
| parent | 9d11db12002cc4e41efce0f3e9aec3d35b35a6f8 (diff) | |
| download | php-git-6fdf6b4c82d2c752ce11f8e5441428e960f338eb.tar.gz | |
- Fix precedence of the variables order in $_FORM
- Rename $_FORM to $_REQUEST for now
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/main.c b/main/main.c index bd835ecb94..0904037ba1 100644 --- a/main/main.c +++ b/main/main.c @@ -894,7 +894,7 @@ int php_module_startup(sapi_module_struct *sf) 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 @@ static int php_hash_environment(TSRMLS_D) 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; |