diff options
| author | Jani Taskinen <jani@php.net> | 2010-11-17 11:55:37 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-11-17 11:55:37 +0000 |
| commit | 2f27a0b1b84126cdac573b1195f674111250e654 (patch) | |
| tree | 758fa72bef95f6819fb5e6445bee9535b1233ef5 | |
| parent | 0c7c01a480a8c9c75a50c0a77cea822883721c28 (diff) | |
| download | php-git-2f27a0b1b84126cdac573b1195f674111250e654.tar.gz | |
- Cleanup
| -rw-r--r-- | main/php_variables.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index b8113a66da..719f236255 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -816,7 +816,7 @@ static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRML array_init(form_variables); INIT_PZVAL(form_variables); - if(PG(request_order) != NULL) { + if (PG(request_order) != NULL) { p = PG(request_order); } else { p = PG(variables_order); @@ -854,13 +854,13 @@ static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRML void php_startup_auto_globals(TSRMLS_D) { - zend_register_auto_global("_GET", sizeof("_GET")-1, 0, php_auto_globals_create_get TSRMLS_CC); - zend_register_auto_global("_POST", sizeof("_POST")-1, 0, php_auto_globals_create_post TSRMLS_CC); - zend_register_auto_global("_COOKIE", sizeof("_COOKIE")-1, 0, php_auto_globals_create_cookie TSRMLS_CC); - zend_register_auto_global("_SERVER", sizeof("_SERVER")-1, PG(auto_globals_jit), php_auto_globals_create_server TSRMLS_CC); - zend_register_auto_global("_ENV", sizeof("_ENV")-1, PG(auto_globals_jit), php_auto_globals_create_env TSRMLS_CC); - zend_register_auto_global("_REQUEST", sizeof("_REQUEST")-1, PG(auto_globals_jit), php_auto_globals_create_request TSRMLS_CC); - zend_register_auto_global("_FILES", sizeof("_FILES")-1, 0, php_auto_globals_create_files TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_GET"), 0, php_auto_globals_create_get TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_POST"), 0, php_auto_globals_create_post TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_COOKIE"), 0, php_auto_globals_create_cookie TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_SERVER"), PG(auto_globals_jit), php_auto_globals_create_server TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_ENV"), PG(auto_globals_jit), php_auto_globals_create_env TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_REQUEST"), PG(auto_globals_jit), php_auto_globals_create_request TSRMLS_CC); + zend_register_auto_global(ZEND_STRL("_FILES"), 0, php_auto_globals_create_files TSRMLS_CC); } /* |