auto_globals_jit support for ext/filter

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 6e805f61d6fedb8be6b2e68206411c210ccc825d..f60ba0b4a3a143dddec3ad092783a9aa5c66daa6 100644 (file)
--- 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;