From: Rasmus Lerdorf Date: Wed, 10 May 2006 23:09:03 +0000 (+0000) Subject: auto_globals_jit support for ext/filter X-Git-Tag: BEFORE_NEW_OUTPUT_API~237 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=294e1cd2d8ebf278b9f1826f9075513d1908d2ac;p=php auto_globals_jit support for ext/filter --- diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 6e805f61d6..f60ba0b4a3 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -425,6 +425,7 @@ static void php_zval_filter_recursive(zval *value, long filter, long flags, zval static zval * php_filter_get_storage(long arg TSRMLS_DC) /* {{{ */ { zval * array_ptr = NULL; + zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_globals) && !PG(register_long_arrays)); switch (arg) { case PARSE_GET: array_ptr = IF_G(get_array); @@ -436,9 +437,11 @@ static zval * php_filter_get_storage(long arg TSRMLS_DC) /* {{{ */ array_ptr = IF_G(cookie_array); break; case PARSE_SERVER: + if(jit_initialization) zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC); array_ptr = IF_G(server_array); break; case PARSE_ENV: + if(jit_initialization) zend_is_auto_global("_ENV", sizeof("_ENV")-1 TSRMLS_CC); array_ptr = IF_G(env_array); break; } @@ -533,8 +536,8 @@ PHP_FUNCTION(input_get) break; case PARSE_REQUEST: - /* FIXME: Implement session source */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "INPUT_SESSION not implemented"); + /* FIXME: Implement request source */ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "INPUT_REQUEST not implemented"); return; if (PG(variables_order)) { zval **a_ptr = &array_ptr;