jani Wed, 17 Nov 2010 11:55:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305452
Log:
- Cleanup
Changed paths:
U php/php-src/trunk/main/php_variables.c
Modified: php/php-src/trunk/main/php_variables.c
===================================================================
--- php/php-src/trunk/main/php_variables.c 2010-11-17 09:58:43 UTC (rev
305451)
+++ php/php-src/trunk/main/php_variables.c 2010-11-17 11:55:37 UTC (rev
305452)
@@ -816,7 +816,7 @@
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 @@
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);
}
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
