Merge branch 'master-5.6' of git://anonscm.debian.org/pkg-php/php

Conflicts:
	debian/changelog
	debian/patches/series

118 files changed, 5909 insertions, 5411 deletions

diff --git a/Zend/tests/bug65419.phpt b/Zend/tests/bug65419.phpt
new file mode 100644
index 000000000..677b2750f
--- /dev/null
+++ b/Zend/tests/bug65419.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #65419 (Inside trait, self::class != __CLASS__)
+--FILE--
+<?php
+trait abc
+{
+  static function def()
+  {
+    echo self::class, "\n";
+    echo __CLASS__, "\n";
+  }
+}
+
+class ghi
+{
+  use abc;
+}
+
+ghi::def();
+?>
+--EXPECTF--
+ghi
+ghi
\ No newline at end of file
diff --git a/Zend/tests/bug67111.phpt b/Zend/tests/bug67111.phpt
new file mode 100644
index 000000000..0fdfdfb51
--- /dev/null
+++ b/Zend/tests/bug67111.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #67111: Memory leak when using "continue 2" inside two foreach loops
+--FILE--
+<?php
+
+$array1 = [1, 2, 3];
+$array2 = [1, 2, 3];
+
+foreach ($array1 as $x) {
+    foreach ($array2 as $y) {
+        echo "$x.$y\n";
+        continue 2;
+    }
+}
+
+?>
+--EXPECT--
+1.1
+2.1
+3.1
diff --git a/Zend/tests/bug67436/bug67436_nohandler.phpt b/Zend/tests/bug67436/bug67436_nohandler.phpt
index 464f71153..f1760c646 100644
--- a/Zend/tests/bug67436/bug67436_nohandler.phpt
+++ b/Zend/tests/bug67436/bug67436_nohandler.phpt
@@ -19,6 +19,6 @@ $b = new b();
 $b->test();
 
 --EXPECTF--
-Strict Standards: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s/bug67436/b.php on line %d
+Strict Standards: Declaration of b::test() should be compatible with a::test($arg = c::TESTCONSTANT) in %s%ebug67436%eb.php on line %d
 b::test()
 a::test(c::TESTCONSTANT)
diff --git a/Zend/tests/bug67633.phpt b/Zend/tests/bug67633.phpt
new file mode 100644
index 000000000..a9e05d10a
--- /dev/null
+++ b/Zend/tests/bug67633.phpt
@@ -0,0 +1,44 @@
+--TEST--
+Bug #67633: A foreach on an array returned from a function not doing copy-on-write
+--FILE--
+<?php
+
+function id($x) {
+    return $x;
+}
+
+function &ref_id(&$x) {
+    return $x;
+}
+
+$c = 'c';
+$array = ['a', 'b', $c];
+
+foreach(id($array) as &$v) {
+    $v .= 'q';
+}
+var_dump($array);
+
+foreach(ref_id($array) as &$v) {
+    $v .= 'q';
+}
+var_dump($array);
+
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "b"
+  [2]=>
+  string(1) "c"
+}
+array(3) {
+  [0]=>
+  string(2) "aq"
+  [1]=>
+  string(2) "bq"
+  [2]=>
+  &string(2) "cq"
+}
diff --git a/Zend/tests/bug67938.phpt b/Zend/tests/bug67938.phpt
new file mode 100644
index 000000000..6597c4895
--- /dev/null
+++ b/Zend/tests/bug67938.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #67938: Segfault when extending interface method with variadic
+--FILE--
+<?php
+
+interface TestInterface {
+    public function foo();
+    public function bar(array $bar);
+}
+
+class Test implements TestInterface {
+    public function foo(...$args) {
+        echo __METHOD__, "\n";
+    }
+    public function bar(array $bar, ...$args) {
+        echo __METHOD__, "\n";
+    }
+}
+
+$obj = new Test;
+$obj->foo();
+$obj->bar([]);
+
+?>
+--EXPECT--
+Test::foo
+Test::bar
diff --git a/Zend/tests/bug67985.phpt b/Zend/tests/bug67985.phpt
new file mode 100644
index 000000000..6f032643f
--- /dev/null
+++ b/Zend/tests/bug67985.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #67985 - Last used array index not copied to new array at assignment
+--FILE--
+<?php
+
+$a = ['zero', 'one', 'two'];
+unset($a[2]);
+$b = $a;
+$a[] = 'three';
+$b[] = 'three';
+
+var_dump($a === $b);
+
+?>
+--EXPECT--
+bool(true)
diff --git a/Zend/tests/bug68118.phpt b/Zend/tests/bug68118.phpt
new file mode 100644
index 000000000..c56e70a11
--- /dev/null
+++ b/Zend/tests/bug68118.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #68118: $a->foo .= 'test'; can leave $a->foo undefined
+--FILE--
+<?php
+
+set_error_handler(function() {
+    $obj = new stdClass;
+    $obj->test = 'meow';
+    return true;
+});
+ 
+$a = new stdClass;
+$a->undefined .= 'test';
+var_dump($a);
+
+?>
+--EXPECT--
+object(stdClass)#2 (1) {
+  ["undefined"]=>
+  string(4) "test"
+}
diff --git a/Zend/tests/bug68370.phpt b/Zend/tests/bug68370.phpt
new file mode 100644
index 000000000..25589bf45
--- /dev/null
+++ b/Zend/tests/bug68370.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #68370 "unset($this)" can make the program crash
+--FILE--
+<?php
+class C {
+	public function test() {
+		unset($this);
+		return get_defined_vars();
+	}
+}
+$c = new C();
+$x = $c->test();
+print_r($x);
+unset($c, $x);
+--EXPECTF--
+Array
+(
+)
diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/bug68446.phpt
new file mode 100644
index 000000000..48e6f52f1
--- /dev/null
+++ b/Zend/tests/bug68446.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Bug #68446 (Array constant not accepted for array parameter default)
+--FILE--
+<?php
+const FOO = [1];
+const BAR = null;
+
+function a(array $a = FOO) {
+	var_dump($a);
+}
+
+function b(array $b = BAR) {
+	var_dump($b);
+}
+
+b(null);
+b([]);
+b();
+a([]);
+a();
+a(null);
+?>
+--EXPECTF--
+NULL
+array(0) {
+}
+NULL
+array(0) {
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+
+Catchable fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d
+
diff --git a/Zend/tests/traits/bug65576a.phpt b/Zend/tests/traits/bug65576a.phpt
new file mode 100644
index 000000000..49b2ba0c9
--- /dev/null
+++ b/Zend/tests/traits/bug65576a.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #65576 (Constructor from trait conflicts with inherited constructor)
+--FILE--
+<?php
+
+trait T
+{
+  public function __construct()
+  {
+    echo "Trait contructor\n";
+  }
+}
+
+class A
+{
+  public function __construct()
+  {
+    echo "Parent constructor\n";
+  }
+}
+
+class B extends A
+{
+  use T;
+}
+
+new B();
+
+--EXPECT--
+Trait contructor
+
diff --git a/Zend/tests/traits/bug65576b.phpt b/Zend/tests/traits/bug65576b.phpt
new file mode 100644
index 000000000..3be52ba7c
--- /dev/null
+++ b/Zend/tests/traits/bug65576b.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Bug #65576 (Constructor from trait conflicts with inherited constructor)
+--FILE--
+<?php
+
+trait T
+{
+  public function __construct()
+  {
+    parent::__construct();
+    echo "Trait contructor\n";
+  }
+}
+
+class A
+{
+  public function __construct()
+  {
+    echo "Parent constructor\n";
+  }
+}
+
+class B extends A
+{
+  use T;
+}
+
+new B();
+
+--EXPECT--
+Parent constructor
+Trait contructor
+
diff --git a/Zend/zend.c b/Zend/zend.c
index 34dcc7546..ef4ad7974 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -128,7 +128,7 @@ ZEND_API zval zval_used_for_init; /* True global variable */
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2014 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2015 Zend Technologies\n"
 #define PRINT_ZVAL_INDENT 4
 
 static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object TSRMLS_DC) /* {{{ */
@@ -818,10 +818,21 @@ void zend_shutdown(TSRMLS_D) /* {{{ */
 #ifdef ZEND_SIGNALS
 	zend_signal_shutdown(TSRMLS_C);
 #endif
-#ifdef ZEND_WIN32
-	zend_shutdown_timeout_thread();
-#endif
 	zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
+
+	if (EG(active))
+	{
+		/*
+		 * The order of destruction is important here.
+		 * See bugs #65463 and 66036.
+		 */
+		zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) zend_cleanup_function_data_full TSRMLS_CC);
+		zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) zend_cleanup_user_class_data TSRMLS_CC);
+		zend_cleanup_internal_classes(TSRMLS_C);
+		zend_hash_reverse_apply(GLOBAL_FUNCTION_TABLE, (apply_func_t) clean_non_persistent_function_full TSRMLS_CC);
+		zend_hash_reverse_apply(GLOBAL_CLASS_TABLE, (apply_func_t) clean_non_persistent_class_full TSRMLS_CC);
+	}
+
 	zend_destroy_modules();
 
  	virtual_cwd_deactivate(TSRMLS_C);
@@ -887,7 +898,7 @@ ZEND_API void _zend_bailout(char *filename, uint lineno) /* {{{ */
 /* }}} */
 END_EXTERN_C()
 
-void zend_append_version_info(const zend_extension *extension) /* {{{ */
+ZEND_API void zend_append_version_info(const zend_extension *extension) /* {{{ */
 {
 	char *new_info;
 	uint new_info_length;
diff --git a/Zend/zend.h b/Zend/zend.h
index f81e859fe..1d2b3fb4a 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index b8dd3434c..ed56fefbe 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -2499,7 +2499,7 @@ ZEND_API void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */
 /* }}} */
 
 /* return the next free module number */
-int zend_next_free_module(void) /* {{{ */
+ZEND_API int zend_next_free_module(void) /* {{{ */
 {
 	return zend_hash_num_elements(&module_registry) + 1;
 }
@@ -2635,18 +2635,15 @@ ZEND_API ZEND_FUNCTION(display_disabled_function)
 }
 /* }}} */
 
-static zend_function_entry disabled_function[] = {
-	ZEND_FE(display_disabled_function,			NULL)
-	ZEND_FE_END
-};
-
 ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */
 {
-	if (zend_hash_del(CG(function_table), function_name, function_name_length+1)==FAILURE) {
-		return FAILURE;
+	zend_internal_function *func;
+	if (zend_hash_find(CG(function_table), function_name, function_name_length+1, (void **)&func)==SUCCESS) {
+		func->arg_info = NULL;
+		func->handler = ZEND_FN(display_disabled_function);
+		return SUCCESS;
 	}
-	disabled_function[0].fname = function_name;
-	return zend_register_functions(NULL, disabled_function, CG(function_table), MODULE_PERSISTENT TSRMLS_CC);
+	return FAILURE;
 }
 /* }}} */
 
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index efc267f91..e837647ce 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -233,7 +233,7 @@ typedef struct _zend_fcall_info_cache {
 
 #define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)
 
-int zend_next_free_module(void);
+ZEND_API int zend_next_free_module(void);
 
 BEGIN_EXTERN_C()
 ZEND_API int zend_get_parameters(int ht, int param_count, ...);
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index bdcee5cbe..db71d52b6 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 05494ee37..1f0b13e4c 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index a7df0adba..0e04b83c3 100644
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index f8df15c95..4cc5acb41 100644
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_build.h b/Zend/zend_build.h
index bec174d5c..682c6b01b 100644
--- a/Zend/zend_build.h
+++ b/Zend/zend_build.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index d7a1b3710..be93dd430 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_builtin_functions.h b/Zend/zend_builtin_functions.h
index 3db0d2002..3d36c1362 100644
--- a/Zend/zend_builtin_functions.h
+++ b/Zend/zend_builtin_functions.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index bd2ede329..53465af02 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -443,6 +443,7 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent
 
 	closure->func = *func;
 	closure->func.common.prototype = NULL;
+	closure->func.common.fn_flags |= ZEND_ACC_CLOSURE;
 
 	if ((scope == NULL) && (this_ptr != NULL)) {
 		/* use dummy scope if we're binding an object without specifying a scope */
diff --git a/Zend/zend_closures.h b/Zend/zend_closures.h
index fa66e9747..d14c45d52 100644
--- a/Zend/zend_closures.h
+++ b/Zend/zend_closures.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7c979d56b..c513e2ff8 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -1931,8 +1931,11 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 			if (class_type->u.constant.type == IS_ARRAY) {
 				cur_arg_info->type_hint = IS_ARRAY;
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
 						cur_arg_info->allow_null = 1;
+					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
+						/* delay constant resolution and check to run-time */
+						cur_arg_info->allow_null = 0;
 					} else if (Z_TYPE(initialization->u.constant) != IS_ARRAY) {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with array type hint can only be an array or NULL");
 					}
@@ -1940,8 +1943,11 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 			} else if (class_type->u.constant.type == IS_CALLABLE) {
 				cur_arg_info->type_hint = IS_CALLABLE;
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
 						cur_arg_info->allow_null = 1;
+					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
+						/* delay constant resolution and check to run-time */
+						cur_arg_info->allow_null = 0;
 					} else {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with callable type hint can only be NULL");
 					}
@@ -1955,8 +1961,11 @@ void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initializ
 				cur_arg_info->class_name = Z_STRVAL(class_type->u.constant);
 				cur_arg_info->class_name_len = Z_STRLEN(class_type->u.constant);
 				if (op == ZEND_RECV_INIT) {
-					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL")) || Z_TYPE(initialization->u.constant) == IS_CONSTANT_AST) {
+					if (Z_TYPE(initialization->u.constant) == IS_NULL || (Z_TYPE(initialization->u.constant) == IS_CONSTANT && !strcasecmp(Z_STRVAL(initialization->u.constant), "NULL"))) {
 						cur_arg_info->allow_null = 1;
+					} else if (IS_CONSTANT_TYPE(Z_TYPE(initialization->u.constant))) {
+						/* delay constant resolution and check to run-time */
+						cur_arg_info->allow_null = 0;
 					} else {
 						zend_error_noreturn(E_COMPILE_ERROR, "Default value for parameters with a class type hint can only be NULL");
 					}
@@ -2205,6 +2214,12 @@ void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static
 			if (!CG(active_class_entry)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot access self::class when no class scope is active");
 			}
+			if (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) {
+				constant_name.op_type = IS_CONST;
+				ZVAL_STRINGL(&constant_name.u.constant, "class", sizeof("class")-1, 1);
+				zend_do_fetch_constant(result, class_name, &constant_name, ZEND_RT, 1 TSRMLS_CC);
+				break;
+			}
 			zval_dtor(&class_name->u.constant);
 			class_name->op_type = IS_CONST;
 			ZVAL_STRINGL(&class_name->u.constant, CG(active_class_entry)->name, CG(active_class_entry)->name_length, 1);
@@ -3258,7 +3273,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 	 * go through all the parameters of the function and not just those present in the
 	 * prototype. */
 	num_args = proto->common.num_args;
-	if ((fe->common.fn_flags & ZEND_ACC_VARIADIC)
+	if ((proto->common.fn_flags & ZEND_ACC_VARIADIC)
 		&& fe->common.num_args > proto->common.num_args) {
 		num_args = fe->common.num_args;
 	}
@@ -3964,7 +3979,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 	if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
 		ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE;
 	} else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) {
-		if (ce->constructor) {
+		if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
 			zend_error_noreturn(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 		}
 		ce->constructor = fe; fe->common.fn_flags |= ZEND_ACC_CTOR;
@@ -3991,7 +4006,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint
 		zend_str_tolower_copy(lowercase_name, ce->name, ce->name_length);
 		lowercase_name = (char*)zend_new_interned_string(lowercase_name, ce->name_length + 1, 1 TSRMLS_CC);
 		if (!memcmp(mname, lowercase_name, mname_len)) {
-			if (ce->constructor) {
+			if (ce->constructor && (!ce->parent || ce->constructor != ce->parent->constructor)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name);
 			}
 			ce->constructor = fe;
@@ -4246,8 +4261,8 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 
 					/* make sure that the trait method is not from a class mentioned in
 					 exclude_from_classes, for consistency */
-					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i]) {
-						zend_error_noreturn(E_COMPILE_ERROR,
+					if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j]) {
+						zend_error(E_COMPILE_ERROR,
 								   "Inconsistent insteadof definition. "
 								   "The method %s is to be used from %s, but %s is also on the exclude list",
 								   cur_method_ref->method_name,
@@ -6337,6 +6352,15 @@ void zend_do_foreach_begin(znode *foreach_token, znode *open_brackets_token, zno
 		/* save the location of FETCH_W instruction(s) */
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
 		zend_do_end_variable_parse(array, BP_VAR_W, 0 TSRMLS_CC);
+
+		if (zend_is_function_or_method_call(array)) {
+			opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+			opline->opcode = ZEND_SEPARATE;
+			SET_NODE(opline->op1, array);
+			SET_UNUSED(opline->op2);
+			opline->result_type = IS_VAR;
+			opline->result.var = opline->op1.var;
+		}
 	} else {
 		is_variable = 0;
 		open_brackets_token->u.op.opline_num = get_next_op_number(CG(active_op_array));
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index f86a41ae2..3e9992f15 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -686,6 +686,8 @@ ZEND_API void zend_cleanup_internal_class_data(zend_class_entry *ce TSRMLS_DC);
 ZEND_API void zend_cleanup_internal_classes(TSRMLS_D);
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 ZEND_API int zend_cleanup_function_data_full(zend_function *function TSRMLS_DC);
+ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC);
+ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC);
 
 ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
 ZEND_API void zend_function_dtor(zend_function *function);
diff --git a/Zend/zend_config.nw.h b/Zend/zend_config.nw.h
index bbb2da6e7..518ffad04 100644
--- a/Zend/zend_config.nw.h
+++ b/Zend/zend_config.nw.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index 6ea67602b..203f261b1 100644
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 0f44f58a7..3feb02115 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h
index a40db3a8a..8e65d5d08 100644
--- a/Zend/zend_constants.h
+++ b/Zend/zend_constants.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c
index 40b28f7a2..38620e682 100644
--- a/Zend/zend_default_classes.c
+++ b/Zend/zend_default_classes.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_dynamic_array.c b/Zend/zend_dynamic_array.c
index db81b00a7..fa7503ffb 100644
--- a/Zend/zend_dynamic_array.c
+++ b/Zend/zend_dynamic_array.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_dynamic_array.h b/Zend/zend_dynamic_array.h
index e69eb1876..fcc89b78a 100644
--- a/Zend/zend_dynamic_array.h
+++ b/Zend/zend_dynamic_array.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index 941903d16..85f03f171 100644
--- a/Zend/zend_errors.h
+++ b/Zend/zend_errors.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index e4570269e..3d73e92c5 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
index 2ce9c1295..9e18a45b0 100644
--- a/Zend/zend_exceptions.h
+++ b/Zend/zend_exceptions.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 6ada04e1c..7d21c2943 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -608,7 +608,22 @@ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend
 	return 0;
 }
 
-static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type TSRMLS_DC)
+static int is_null_constant(zval *default_value TSRMLS_DC)
+{
+	if (IS_CONSTANT_TYPE(Z_TYPE_P(default_value))) {
+		zval constant = *default_value;
+		zval *constant_ptr = &constant;
+
+		zval_update_constant(&constant_ptr, 0 TSRMLS_CC);
+		if (Z_TYPE(constant) == IS_NULL) {
+			return 1;
+		}
+		zval_dtor(&constant);
+	}
+	return 0;
+}
+
+static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zval *arg, ulong fetch_type, zval *default_value TSRMLS_DC)
 {
 	zend_arg_info *cur_arg_info;
 	char *need_msg;
@@ -638,7 +653,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 			if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
 				return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name TSRMLS_CC);
 			}
-		} else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
+		} else if (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC)))) {
 			need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce TSRMLS_CC);
 			return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "" TSRMLS_CC);
 		}
@@ -649,7 +664,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", "none", "" TSRMLS_CC);
 				}
 
-				if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
+				if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC))))) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "" TSRMLS_CC);
 				}
 				break;
@@ -658,7 +673,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
 				if (!arg) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", "none", "" TSRMLS_CC);
 				}
-				if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
+				if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL TSRMLS_CC) && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value TSRMLS_CC))))) {
 					return zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "" TSRMLS_CC);
 				}
 				break;
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 9bde312e5..b82b55af2 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -364,13 +364,6 @@ void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC);
 
 ZEND_API void zend_fetch_dimension_by_zval(zval **result, zval *container, zval *dim TSRMLS_DC);
 
-#ifdef ZEND_WIN32
-void zend_init_timeout_thread(void);
-void zend_shutdown_timeout_thread(void);
-#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
-#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
-#endif
-
 #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 #define zendi_zval_dtor(p) zval_dtor(&(p))
 
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index af32e91f2..aeced8fb4 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -46,13 +46,10 @@ ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0
 ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };
 
 #ifdef ZEND_WIN32
-#include <process.h>
-static WNDCLASS wc;
-static HWND timeout_window;
-static HANDLE timeout_thread_event;
-static HANDLE timeout_thread_handle;
-static DWORD timeout_thread_id;
-static int timeout_thread_initialized=0;
+#ifdef ZTS
+__declspec(thread)
+#endif
+HANDLE tq_timer = NULL;
 #endif
 
 #if 0&&ZEND_DEBUG
@@ -109,7 +106,7 @@ static int clean_non_persistent_function(zend_function *function TSRMLS_DC) /* {
 }
 /* }}} */
 
-static int clean_non_persistent_function_full(zend_function *function TSRMLS_DC) /* {{{ */
+ZEND_API int clean_non_persistent_function_full(zend_function *function TSRMLS_DC) /* {{{ */
 {
 	return (function->type == ZEND_INTERNAL_FUNCTION) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 }
@@ -121,7 +118,7 @@ static int clean_non_persistent_class(zend_class_entry **ce TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */
+ZEND_API int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {{{ */
 {
 	return ((*ce)->type == ZEND_INTERNAL_CLASS) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE;
 }
@@ -1234,111 +1231,19 @@ ZEND_API void zend_timeout(int dummy) /* {{{ */
 /* }}} */
 
 #ifdef ZEND_WIN32
-static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) /* {{{ */
-{
-	switch (message) {
-		case WM_DESTROY:
-			PostQuitMessage(0);
-			break;
-		case WM_REGISTER_ZEND_TIMEOUT:
-			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
-			if (lParam == 0) {
-				KillTimer(timeout_window, wParam);
-			} else {
-#ifdef ZTS
-				void ***tsrm_ls;
-#endif
-				SetTimer(timeout_window, wParam, lParam*1000, NULL);
-#ifdef ZTS
-				tsrm_ls = ts_resource_ex(0, &wParam);
-				if (!tsrm_ls) {
-					/* shouldn't normally happen */
-					break;
-				}
-#endif
-				EG(timed_out) = 0;
-			}
-			break;
-		case WM_UNREGISTER_ZEND_TIMEOUT:
-			/* wParam is the thread id pointer */
-			KillTimer(timeout_window, wParam);
-			break;
-		case WM_TIMER: {
-#ifdef ZTS
-				void ***tsrm_ls;
-
-				tsrm_ls = ts_resource_ex(0, &wParam);
-				if (!tsrm_ls) {
-					/* Thread died before receiving its timeout? */
-					break;
-				}
-#endif
-				KillTimer(timeout_window, wParam);
-				EG(timed_out) = 1;
-			}
-			break;
-		default:
-			return DefWindowProc(hWnd, message, wParam, lParam);
-	}
-	return 0;
-}
-/* }}} */
-
-static unsigned __stdcall timeout_thread_proc(void *pArgs) /* {{{ */
+VOID CALLBACK tq_timer_cb(PVOID arg, BOOLEAN timed_out)
 {
-	MSG message;
-
-	wc.style=0;
-	wc.lpfnWndProc = zend_timeout_WndProc;
-	wc.cbClsExtra=0;
-	wc.cbWndExtra=0;
-	wc.hInstance=NULL;
-	wc.hIcon=NULL;
-	wc.hCursor=NULL;
-	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
-	wc.lpszMenuName=NULL;
-	wc.lpszClassName = "Zend Timeout Window";
-	if (!RegisterClass(&wc)) {
-		return -1;
-	}
-	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
-	SetEvent(timeout_thread_event);
-	while (GetMessage(&message, NULL, 0, 0)) {
-		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
-		if (message.message == WM_QUIT) {
-			break;
-		}
-	}
-	DestroyWindow(timeout_window);
-	UnregisterClass(wc.lpszClassName, NULL);
-	SetEvent(timeout_thread_handle);
-	return 0;
-}
-/* }}} */
+	zend_bool *php_timed_out;
 
-void zend_init_timeout_thread(void) /* {{{ */
-{
-	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
-	timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
-	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
-	WaitForSingleObject(timeout_thread_event, INFINITE);
-}
-/* }}} */
-
-void zend_shutdown_timeout_thread(void) /* {{{ */
-{
-	if (!timeout_thread_initialized) {
+	/* The doc states it'll be always true, however it theoretically
+		could be FALSE when the thread was signaled. */
+	if (!timed_out) {
 		return;
 	}
-	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);
 
-	/* Wait for thread termination */
-	WaitForSingleObject(timeout_thread_handle, 5000);
-	CloseHandle(timeout_thread_handle);
-	timeout_thread_initialized = 0;
+	php_timed_out = (zend_bool *)arg;
+	*php_timed_out = 1;
 }
-/* }}} */
-
 #endif
 
 /* This one doesn't exists on QNX */
@@ -1356,13 +1261,28 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 	if(!seconds) {
 		return;
 	}
-	if (timeout_thread_initialized == 0 && InterlockedIncrement(&timeout_thread_initialized) == 1) {
-		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
-		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
-		 */
-		zend_init_timeout_thread();
+
+        /* Don't use ChangeTimerQueueTimer() as it will not restart an expired
+		timer, so we could end up with just an ignored timeout. Instead
+		delete and recreate. */
+	if (NULL != tq_timer) {
+		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
+			EG(timed_out) = 0;
+			tq_timer = NULL;
+			zend_error(E_ERROR, "Could not delete queued timer");
+			return;
+		}
+		tq_timer = NULL;
+	}
+
+	/* XXX passing NULL means the default timer queue provided by the system is used */
+	if (!CreateTimerQueueTimer(&tq_timer, NULL, (WAITORTIMERCALLBACK)tq_timer_cb, (VOID*)&EG(timed_out), seconds*1000, 0, WT_EXECUTEONLYONCE)) {
+		EG(timed_out) = 0;
+		tq_timer = NULL;
+		zend_error(E_ERROR, "Could not queue new timer");
+		return;
 	}
-	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
+	EG(timed_out) = 0;
 #else
 #	ifdef HAVE_SETITIMER
 	{
@@ -1404,9 +1324,16 @@ void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 void zend_unset_timeout(TSRMLS_D) /* {{{ */
 {
 #ifdef ZEND_WIN32
-	if(timeout_thread_initialized) {
-		PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
+	if (NULL != tq_timer) {
+		if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) {
+			EG(timed_out) = 0;
+			tq_timer = NULL;
+			zend_error(E_ERROR, "Could not delete queued timer");
+			return;
+		}
+		tq_timer = NULL;
 	}
+	EG(timed_out) = 0;
 #else
 #	ifdef HAVE_SETITIMER
 	if (EG(timeout_seconds)) {
@@ -1656,13 +1583,6 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
 				/*printf("Cache miss!  Initialized %x\n", EG(active_symbol_table));*/
 			}
 			ex->symbol_table = EG(active_symbol_table);
-
-			if (ex->op_array->this_var != -1 &&
-			    !*EX_CV_NUM(ex, ex->op_array->this_var) &&
-			    EG(This)) {
-			    *EX_CV_NUM(ex, ex->op_array->this_var) = (zval**)EX_CV_NUM(ex, ex->op_array->last_var + ex->op_array->this_var);
-				**EX_CV_NUM(ex, ex->op_array->this_var) = EG(This);
- 			}
 			for (i = 0; i < ex->op_array->last_var; i++) {
 				if (*EX_CV_NUM(ex, i)) {
 					zend_hash_quick_update(EG(active_symbol_table),
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index e1290b78c..8321f1ce8 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 3eda38aa9..ed615f1f6 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -111,7 +111,7 @@ END_EXTERN_C()
 ZEND_API extern zend_llist zend_extensions;
 
 void zend_extension_dtor(zend_extension *extension);
-void zend_append_version_info(const zend_extension *extension);
+ZEND_API void zend_append_version_info(const zend_extension *extension);
 int zend_startup_extensions_mechanism(void);
 int zend_startup_extensions(void);
 void zend_shutdown_extensions(TSRMLS_D);
diff --git a/Zend/zend_float.c b/Zend/zend_float.c
index ca0130134..50671c3a8 100644
--- a/Zend/zend_float.c
+++ b/Zend/zend_float.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index 33f8e93fb..297316fa9 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -21,6 +21,8 @@
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H
 
+BEGIN_EXTERN_C()
+
 /*
   Define functions for FP initialization and de-initialization.
 */
@@ -28,6 +30,8 @@ extern ZEND_API void zend_init_fpu(TSRMLS_D);
 extern ZEND_API void zend_shutdown_fpu(TSRMLS_D);
 extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D);
 
+END_EXTERN_C()
+
 /* Copy of the contents of xpfpa.h (which is under public domain)
    See http://wiki.php.net/rfc/rounding for details.
 
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index 76217e369..55ca456fd 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
index ac5f6350a..fee8cc8d3 100644
--- a/Zend/zend_gc.h
+++ b/Zend/zend_gc.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 2b4a8c9a1..cc284e263 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index 2373a1a7c..d460c908a 100644
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 31dd9af61..480c4afb8 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
@@ -283,7 +283,7 @@ struct _zend_ini_scanner_globals {
 	char *filename;
 	int lineno;
 
-	/* Modes are: ZEND_INI_SCANNER_NORMAL, ZEND_INI_SCANNER_RAW */
+	/* Modes are: ZEND_INI_SCANNER_NORMAL, ZEND_INI_SCANNER_RAW, ZEND_INI_SCANNER_TYPED */
 	int scanner_mode;
 };
 
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index ac9b79377..af988c8c2 100644
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index a9fd3e9a4..70f4527af 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 03f83dfb1..88cbca868 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 31d99b7df..4c99f3bb9 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h
index 1a3550513..710576335 100644
--- a/Zend/zend_highlight.h
+++ b/Zend/zend_highlight.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c
index 920d41281..4991a9947 100644
--- a/Zend/zend_indent.c
+++ b/Zend/zend_indent.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_indent.h b/Zend/zend_indent.h
index 6d0996efa..2e01c4400 100644
--- a/Zend/zend_indent.h
+++ b/Zend/zend_indent.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index f286ccd15..b46cedf40 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 0fe4c3161..56c224117 100644
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_ini_parser.c b/Zend/zend_ini_parser.c
index c9d3b3893..c4711aa32 100644
--- a/Zend/zend_ini_parser.c
+++ b/Zend/zend_ini_parser.c
@@ -80,7 +80,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -106,6 +106,10 @@
 #include "zend_ini_scanner.h"
 #include "zend_extensions.h"
 
+#ifdef PHP_WIN32
+#include "win32/syslog.h"
+#endif
+
 #define YYERROR_VERBOSE
 #define YYSTYPE zval
 
@@ -256,10 +260,9 @@ static void ini_error(char *msg)
 
 	if (CG(ini_parser_unbuffered_errors)) {
 #ifdef PHP_WIN32
-		MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
-#else
-		fprintf(stderr, "PHP:  %s", error_buf);
+		syslog(LOG_ALERT, "PHP: %s (%s)", error_buf, GetCommandLine());
 #endif
+		fprintf(stderr, "PHP:  %s", error_buf);
 	} else {
 		zend_error(E_WARNING, "%s", error_buf);
 	}
@@ -365,7 +368,8 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
      TC_QUOTED_STRING = 268,
      BOOL_TRUE = 269,
      BOOL_FALSE = 270,
-     END_OF_LINE = 271
+     NULL_NULL = 271,
+     END_OF_LINE = 272
    };
 #endif
 /* Tokens.  */
@@ -382,7 +386,8 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 #define TC_QUOTED_STRING 268
 #define BOOL_TRUE 269
 #define BOOL_FALSE 270
-#define END_OF_LINE 271
+#define NULL_NULL 271
+#define END_OF_LINE 272
 
 
 
@@ -612,20 +617,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   121
+#define YYLAST   123
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  43
+#define YYNTOKENS  44
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  13
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  49
+#define YYNRULES  50
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  71
+#define YYNSTATES  72
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   271
+#define YYMAXUTOK   272
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -636,16 +641,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    39,    21,     2,    29,    28,    38,    22,
-      41,    42,    27,    24,    19,    25,    20,    26,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    18,     2,
-      31,    17,    32,    33,    34,     2,     2,     2,     2,     2,
+       2,     2,     2,    40,    22,     2,    30,    29,    39,    23,
+      42,    43,    28,    25,    20,    26,    21,    27,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    19,     2,
+      32,    18,    33,    34,    35,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    40,    23,     2,     2,     2,     2,     2,
+       2,     2,     2,    41,    24,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    35,    37,    36,    30,     2,     2,     2,
+       2,     2,     2,    36,    38,    37,    31,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -660,7 +665,7 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16
+      15,    16,    17
 };
 
 #if YYDEBUG
@@ -669,39 +674,41 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     6,     7,    11,    15,    21,    23,    25,
-      27,    28,    30,    32,    34,    36,    38,    39,    42,    45,
-      46,    48,    50,    54,    57,    60,    65,    67,    69,    73,
-      76,    79,    84,    86,    90,    94,    98,   101,   104,   108,
-     112,   114,   116,   118,   120,   122,   124,   126,   128,   130
+      27,    28,    30,    32,    34,    36,    38,    40,    41,    44,
+      47,    48,    50,    52,    56,    59,    62,    67,    69,    71,
+      75,    78,    81,    86,    88,    92,    96,   100,   103,   106,
+     110,   114,   116,   118,   120,   122,   124,   126,   128,   130,
+     132
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      44,     0,    -1,    44,    45,    -1,    -1,     3,    46,    40,
-      -1,     9,    17,    47,    -1,    10,    48,    40,    17,    47,
-      -1,     9,    -1,    16,    -1,    50,    -1,    -1,    52,    -1,
-      14,    -1,    15,    -1,    16,    -1,    51,    -1,    -1,    49,
-      53,    -1,    49,    13,    -1,    -1,    53,    -1,    54,    -1,
-      21,    49,    21,    -1,    50,    53,    -1,    50,    54,    -1,
-      50,    21,    49,    21,    -1,    53,    -1,    55,    -1,    21,
-      49,    21,    -1,    51,    53,    -1,    51,    55,    -1,    51,
-      21,    49,    21,    -1,    51,    -1,    52,    37,    52,    -1,
-      52,    38,    52,    -1,    52,    23,    52,    -1,    30,    52,
-      -1,    39,    52,    -1,    41,    52,    42,    -1,    11,    12,
-      36,    -1,     5,    -1,     4,    -1,     6,    -1,     7,    -1,
-       8,    -1,     5,    -1,     4,    -1,     6,    -1,     7,    -1,
-       8,    -1
+      45,     0,    -1,    45,    46,    -1,    -1,     3,    47,    41,
+      -1,     9,    18,    48,    -1,    10,    49,    41,    18,    48,
+      -1,     9,    -1,    17,    -1,    51,    -1,    -1,    53,    -1,
+      14,    -1,    15,    -1,    16,    -1,    17,    -1,    52,    -1,
+      -1,    50,    54,    -1,    50,    13,    -1,    -1,    54,    -1,
+      55,    -1,    22,    50,    22,    -1,    51,    54,    -1,    51,
+      55,    -1,    51,    22,    50,    22,    -1,    54,    -1,    56,
+      -1,    22,    50,    22,    -1,    52,    54,    -1,    52,    56,
+      -1,    52,    22,    50,    22,    -1,    52,    -1,    53,    38,
+      53,    -1,    53,    39,    53,    -1,    53,    24,    53,    -1,
+      31,    53,    -1,    40,    53,    -1,    42,    53,    43,    -1,
+      11,    12,    37,    -1,     5,    -1,     4,    -1,     6,    -1,
+       7,    -1,     8,    -1,     5,    -1,     4,    -1,     6,    -1,
+       7,    -1,     8,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   276,   276,   277,   281,   288,   296,   305,   306,   310,
-     311,   315,   316,   317,   318,   322,   323,   327,   328,   329,
-     333,   334,   335,   336,   337,   338,   342,   343,   344,   345,
-     346,   347,   351,   352,   353,   354,   355,   356,   357,   361,
-     365,   366,   367,   368,   369,   373,   374,   375,   376,   377
+       0,   280,   280,   281,   285,   292,   300,   309,   310,   314,
+     315,   319,   320,   321,   322,   323,   327,   328,   332,   333,
+     334,   338,   339,   340,   341,   342,   343,   347,   348,   349,
+     350,   351,   352,   356,   357,   358,   359,   360,   361,   362,
+     366,   370,   371,   372,   373,   374,   378,   379,   380,   381,
+     382
 };
 #endif
 
@@ -713,13 +720,13 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "TC_SECTION", "TC_RAW", "TC_CONSTANT",
   "TC_NUMBER", "TC_STRING", "TC_WHITESPACE", "TC_LABEL", "TC_OFFSET",
   "TC_DOLLAR_CURLY", "TC_VARNAME", "TC_QUOTED_STRING", "BOOL_TRUE",
-  "BOOL_FALSE", "END_OF_LINE", "'='", "':'", "','", "'.'", "'\"'", "'\\''",
-  "'^'", "'+'", "'-'", "'/'", "'*'", "'%'", "'$'", "'~'", "'<'", "'>'",
-  "'?'", "'@'", "'{'", "'}'", "'|'", "'&'", "'!'", "']'", "'('", "')'",
-  "$accept", "statement_list", "statement", "section_string_or_value",
-  "string_or_value", "option_offset", "encapsed_list",
-  "var_string_list_section", "var_string_list", "expr", "cfg_var_ref",
-  "constant_literal", "constant_string", 0
+  "BOOL_FALSE", "NULL_NULL", "END_OF_LINE", "'='", "':'", "','", "'.'",
+  "'\"'", "'\\''", "'^'", "'+'", "'-'", "'/'", "'*'", "'%'", "'$'", "'~'",
+  "'<'", "'>'", "'?'", "'@'", "'{'", "'}'", "'|'", "'&'", "'!'", "']'",
+  "'('", "')'", "$accept", "statement_list", "statement",
+  "section_string_or_value", "string_or_value", "option_offset",
+  "encapsed_list", "var_string_list_section", "var_string_list", "expr",
+  "cfg_var_ref", "constant_literal", "constant_string", 0
 };
 #endif
 
@@ -729,31 +736,33 @@ static const char *const yytname[] =
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,    61,    58,    44,
-      46,    34,    39,    94,    43,    45,    47,    42,    37,    36,
-     126,    60,    62,    63,    64,   123,   125,   124,    38,    33,
-      93,    40,    41
+     265,   266,   267,   268,   269,   270,   271,   272,    61,    58,
+      44,    46,    34,    39,    94,    43,    45,    47,    42,    37,
+      36,   126,    60,    62,    63,    64,   123,   125,   124,    38,
+      33,    93,    40,    41
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    43,    44,    44,    45,    45,    45,    45,    45,    46,
-      46,    47,    47,    47,    47,    48,    48,    49,    49,    49,
-      50,    50,    50,    50,    50,    50,    51,    51,    51,    51,
-      51,    51,    52,    52,    52,    52,    52,    52,    52,    53,
-      54,    54,    54,    54,    54,    55,    55,    55,    55,    55
+       0,    44,    45,    45,    46,    46,    46,    46,    46,    47,
+      47,    48,    48,    48,    48,    48,    49,    49,    50,    50,
+      50,    51,    51,    51,    51,    51,    51,    52,    52,    52,
+      52,    52,    52,    53,    53,    53,    53,    53,    53,    53,
+      54,    55,    55,    55,    55,    55,    56,    56,    56,    56,
+      56
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     2,     0,     3,     3,     5,     1,     1,     1,
-       0,     1,     1,     1,     1,     1,     0,     2,     2,     0,
-       1,     1,     3,     2,     2,     4,     1,     1,     3,     2,
-       2,     4,     1,     3,     3,     3,     2,     2,     3,     3,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1
+       0,     1,     1,     1,     1,     1,     1,     0,     2,     2,
+       0,     1,     1,     3,     2,     2,     4,     1,     1,     3,
+       2,     2,     4,     1,     3,     3,     3,     2,     2,     3,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -761,43 +770,43 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       3,     0,     1,    10,     7,    16,     8,     2,    41,    40,
-      42,    43,    44,     0,    19,     0,     9,    20,    21,     0,
-      46,    45,    47,    48,    49,    19,     0,    15,    26,    27,
-       0,     0,     4,    19,    23,    24,    12,    13,    14,     0,
-       0,     0,     5,    32,    11,     0,     0,    19,    29,    30,
-      39,    18,    22,    17,     0,    36,    37,     0,     0,     0,
-       0,    28,     0,     0,    25,    38,    35,    33,    34,     6,
-      31
+       3,     0,     1,    10,     7,    17,     8,     2,    42,    41,
+      43,    44,    45,     0,    20,     0,     9,    21,    22,     0,
+      47,    46,    48,    49,    50,    20,     0,    16,    27,    28,
+       0,     0,     4,    20,    24,    25,    12,    13,    14,    15,
+       0,     0,     0,     5,    33,    11,     0,     0,    20,    30,
+      31,    40,    19,    23,    18,     0,    37,    38,     0,     0,
+       0,     0,    29,     0,     0,    26,    39,    36,    34,    35,
+       6,    32
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     1,     7,    15,    42,    26,    31,    16,    43,    44,
+      -1,     1,     7,    15,    43,    26,    31,    16,    44,    45,
       28,    18,    29
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -29
+#define YYPACT_NINF -25
 static const yytype_int8 yypact[] =
 {
-     -29,    94,   -29,    48,   -15,    66,   -29,   -29,   -29,   -29,
-     -29,   -29,   -29,    -2,   -29,   -28,    74,   -29,   -29,     0,
-     -29,   -29,   -29,   -29,   -29,   -29,   -21,    85,   -29,   -29,
-       1,    54,   -29,   -29,   -29,   -29,   -29,   -29,   -29,    27,
-      27,    27,   -29,    85,    24,    87,    12,   -29,   -29,   -29,
-     -29,   -29,   -29,   -29,    88,   -29,   -29,   -20,    27,    27,
-      27,   -29,     0,   100,   -29,   -29,   -29,   -29,   -29,   -29,
-     -29
+     -25,     9,   -25,    73,   -17,    81,   -25,   -25,   -25,   -25,
+     -25,   -25,   -25,    15,   -25,   -20,    93,   -25,   -25,     0,
+     -25,   -25,   -25,   -25,   -25,   -25,   -12,   101,   -25,   -25,
+      -7,    36,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
+      28,    28,    28,   -25,   101,    -1,    40,    30,   -25,   -25,
+     -25,   -25,   -25,   -25,   -25,    80,   -25,   -25,    33,    28,
+      28,    28,   -25,     0,   100,   -25,   -25,   -25,   -25,   -25,
+     -25,   -25
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -29,   -29,   -29,   -29,   -19,   -29,   -24,   -29,    44,   -14,
-      -3,    34,    -7
+     -25,   -25,   -25,   -25,    -9,   -25,   -23,   -25,    50,     4,
+      -3,    44,   -24
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -807,50 +816,50 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      17,    45,    19,    58,    20,    21,    22,    23,    24,    54,
-      30,    13,    32,    34,    36,    37,    38,    59,    60,    46,
-      49,    25,    65,    63,    48,    55,    56,    57,    53,    62,
-      39,    20,    21,    22,    23,    24,    49,    50,    13,    40,
-      48,    41,    53,    69,    66,    67,    68,    58,    25,    27,
-      35,    53,     8,     9,    10,    11,    12,    39,     0,    13,
-      53,    59,    60,     0,     0,    13,    40,    51,    41,    14,
-      20,    21,    22,    23,    24,    52,     0,    13,     8,     9,
-      10,    11,    12,     0,     0,    13,     0,    25,     0,    20,
-      21,    22,    23,    24,     2,    33,    13,     3,    13,    13,
-      51,    51,     0,     4,     5,     0,    47,     0,    61,    64,
-       6,    13,     0,    51,     0,     0,     0,     0,     0,     0,
-       0,    70
+      17,    19,    46,    50,    20,    21,    22,    23,    24,     2,
+      55,    13,     3,    34,    36,    37,    38,    39,     4,     5,
+      50,    32,    25,    59,    49,    64,     6,    30,    54,    47,
+      51,    40,    20,    21,    22,    23,    24,    60,    61,    13,
+      41,    49,    42,    54,    56,    57,    58,    13,    63,    52,
+      25,    13,    54,    52,    70,    27,     0,    59,    53,    40,
+      35,    54,    62,    67,    68,    69,     0,     0,    41,     0,
+      42,    60,    61,     0,     0,     0,    66,     8,     9,    10,
+      11,    12,     0,     0,    13,    20,    21,    22,    23,    24,
+       0,    13,    13,    52,     0,    14,     0,     8,     9,    10,
+      11,    12,    65,    25,    13,    20,    21,    22,    23,    24,
+       0,    13,    13,    52,     0,    33,     0,     0,     0,     0,
+       0,     0,    71,    48
 };
 
 static const yytype_int8 yycheck[] =
 {
-       3,    25,    17,    23,     4,     5,     6,     7,     8,    33,
-      12,    11,    40,    16,    14,    15,    16,    37,    38,    40,
-      27,    21,    42,    47,    27,    39,    40,    41,    31,    17,
-      30,     4,     5,     6,     7,     8,    43,    36,    11,    39,
-      43,    41,    45,    62,    58,    59,    60,    23,    21,     5,
-      16,    54,     4,     5,     6,     7,     8,    30,    -1,    11,
-      63,    37,    38,    -1,    -1,    11,    39,    13,    41,    21,
-       4,     5,     6,     7,     8,    21,    -1,    11,     4,     5,
-       6,     7,     8,    -1,    -1,    11,    -1,    21,    -1,     4,
-       5,     6,     7,     8,     0,    21,    11,     3,    11,    11,
-      13,    13,    -1,     9,    10,    -1,    21,    -1,    21,    21,
-      16,    11,    -1,    13,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    21
+       3,    18,    25,    27,     4,     5,     6,     7,     8,     0,
+      33,    11,     3,    16,    14,    15,    16,    17,     9,    10,
+      44,    41,    22,    24,    27,    48,    17,    12,    31,    41,
+      37,    31,     4,     5,     6,     7,     8,    38,    39,    11,
+      40,    44,    42,    46,    40,    41,    42,    11,    18,    13,
+      22,    11,    55,    13,    63,     5,    -1,    24,    22,    31,
+      16,    64,    22,    59,    60,    61,    -1,    -1,    40,    -1,
+      42,    38,    39,    -1,    -1,    -1,    43,     4,     5,     6,
+       7,     8,    -1,    -1,    11,     4,     5,     6,     7,     8,
+      -1,    11,    11,    13,    -1,    22,    -1,     4,     5,     6,
+       7,     8,    22,    22,    11,     4,     5,     6,     7,     8,
+      -1,    11,    11,    13,    -1,    22,    -1,    -1,    -1,    -1,
+      -1,    -1,    22,    22
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    44,     0,     3,     9,    10,    16,    45,     4,     5,
-       6,     7,     8,    11,    21,    46,    50,    53,    54,    17,
-       4,     5,     6,     7,     8,    21,    48,    51,    53,    55,
-      12,    49,    40,    21,    53,    54,    14,    15,    16,    30,
-      39,    41,    47,    51,    52,    49,    40,    21,    53,    55,
-      36,    13,    21,    53,    49,    52,    52,    52,    23,    37,
-      38,    21,    17,    49,    21,    42,    52,    52,    52,    47,
-      21
+       0,    45,     0,     3,     9,    10,    17,    46,     4,     5,
+       6,     7,     8,    11,    22,    47,    51,    54,    55,    18,
+       4,     5,     6,     7,     8,    22,    49,    52,    54,    56,
+      12,    50,    41,    22,    54,    55,    14,    15,    16,    17,
+      31,    40,    42,    48,    52,    53,    50,    41,    22,    54,
+      56,    37,    13,    22,    54,    50,    53,    53,    53,    24,
+      38,    39,    22,    18,    50,    22,    43,    53,    53,    53,
+      48,    22
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1679,7 +1688,7 @@ yyreduce:
 #endif
 			ZEND_INI_PARSER_CB(&(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)]), NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC);
 			free(Z_STRVAL((yyvsp[(1) - (3)])));
-			free(Z_STRVAL((yyvsp[(3) - (3)])));
+			zval_internal_dtor(&(yyvsp[(3) - (3)]));
 		}
     break;
 
@@ -1692,7 +1701,7 @@ yyreduce:
 			ZEND_INI_PARSER_CB(&(yyvsp[(1) - (5)]), &(yyvsp[(5) - (5)]), &(yyvsp[(2) - (5)]), ZEND_INI_PARSER_POP_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC);
 			free(Z_STRVAL((yyvsp[(1) - (5)])));
 			free(Z_STRVAL((yyvsp[(2) - (5)])));
-			free(Z_STRVAL((yyvsp[(5) - (5)])));
+			zval_internal_dtor(&(yyvsp[(5) - (5)]));
 		}
     break;
 
@@ -1728,22 +1737,22 @@ yyreduce:
 
   case 14:
 
-    { zend_ini_init_string(&(yyval)); }
+    { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 15:
 
-    { (yyval) = (yyvsp[(1) - (1)]); }
+    { zend_ini_init_string(&(yyval)); }
     break;
 
   case 16:
 
-    { zend_ini_init_string(&(yyval)); }
+    { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 17:
 
-    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (2)]), &(yyvsp[(2) - (2)])); free(Z_STRVAL((yyvsp[(2) - (2)]))); }
+    { zend_ini_init_string(&(yyval)); }
     break;
 
   case 18:
@@ -1753,12 +1762,12 @@ yyreduce:
 
   case 19:
 
-    { zend_ini_init_string(&(yyval)); }
+    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (2)]), &(yyvsp[(2) - (2)])); free(Z_STRVAL((yyvsp[(2) - (2)]))); }
     break;
 
   case 20:
 
-    { (yyval) = (yyvsp[(1) - (1)]); }
+    { zend_ini_init_string(&(yyval)); }
     break;
 
   case 21:
@@ -1768,12 +1777,12 @@ yyreduce:
 
   case 22:
 
-    { (yyval) = (yyvsp[(2) - (3)]); }
+    { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 23:
 
-    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (2)]), &(yyvsp[(2) - (2)])); free(Z_STRVAL((yyvsp[(2) - (2)]))); }
+    { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 24:
@@ -1783,12 +1792,12 @@ yyreduce:
 
   case 25:
 
-    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (4)]), &(yyvsp[(3) - (4)])); free(Z_STRVAL((yyvsp[(3) - (4)]))); }
+    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (2)]), &(yyvsp[(2) - (2)])); free(Z_STRVAL((yyvsp[(2) - (2)]))); }
     break;
 
   case 26:
 
-    { (yyval) = (yyvsp[(1) - (1)]); }
+    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (4)]), &(yyvsp[(3) - (4)])); free(Z_STRVAL((yyvsp[(3) - (4)]))); }
     break;
 
   case 27:
@@ -1798,12 +1807,12 @@ yyreduce:
 
   case 28:
 
-    { (yyval) = (yyvsp[(2) - (3)]); }
+    { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 29:
 
-    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (2)]), &(yyvsp[(2) - (2)])); free(Z_STRVAL((yyvsp[(2) - (2)]))); }
+    { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 30:
@@ -1813,96 +1822,101 @@ yyreduce:
 
   case 31:
 
-    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (4)]), &(yyvsp[(3) - (4)])); free(Z_STRVAL((yyvsp[(3) - (4)]))); }
+    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (2)]), &(yyvsp[(2) - (2)])); free(Z_STRVAL((yyvsp[(2) - (2)]))); }
     break;
 
   case 32:
 
-    { (yyval) = (yyvsp[(1) - (1)]); }
+    { zend_ini_add_string(&(yyval), &(yyvsp[(1) - (4)]), &(yyvsp[(3) - (4)])); free(Z_STRVAL((yyvsp[(3) - (4)]))); }
     break;
 
   case 33:
 
-    { zend_ini_do_op('|', &(yyval), &(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)])); }
+    { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 34:
 
-    { zend_ini_do_op('&', &(yyval), &(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)])); }
+    { zend_ini_do_op('|', &(yyval), &(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)])); }
     break;
 
   case 35:
 
-    { zend_ini_do_op('^', &(yyval), &(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)])); }
+    { zend_ini_do_op('&', &(yyval), &(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)])); }
     break;
 
   case 36:
 
-    { zend_ini_do_op('~', &(yyval), &(yyvsp[(2) - (2)]), NULL); }
+    { zend_ini_do_op('^', &(yyval), &(yyvsp[(1) - (3)]), &(yyvsp[(3) - (3)])); }
     break;
 
   case 37:
 
-    { zend_ini_do_op('!', &(yyval), &(yyvsp[(2) - (2)]), NULL); }
+    { zend_ini_do_op('~', &(yyval), &(yyvsp[(2) - (2)]), NULL); }
     break;
 
   case 38:
 
-    { (yyval) = (yyvsp[(2) - (3)]); }
+    { zend_ini_do_op('!', &(yyval), &(yyvsp[(2) - (2)]), NULL); }
     break;
 
   case 39:
 
-    { zend_ini_get_var(&(yyval), &(yyvsp[(2) - (3)]) TSRMLS_CC); free(Z_STRVAL((yyvsp[(2) - (3)]))); }
+    { (yyval) = (yyvsp[(2) - (3)]); }
     break;
 
   case 40:
 
-    { (yyval) = (yyvsp[(1) - (1)]); }
+    { zend_ini_get_var(&(yyval), &(yyvsp[(2) - (3)]) TSRMLS_CC); free(Z_STRVAL((yyvsp[(2) - (3)]))); }
     break;
 
   case 41:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_RAW: '%s'\n", Z_STRVAL($1));*/ }
+    { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 42:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_NUMBER: '%s'\n", Z_STRVAL($1));*/ }
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_RAW: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
   case 43:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_STRING: '%s'\n", Z_STRVAL($1));*/ }
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_NUMBER: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
   case 44:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_WHITESPACE: '%s'\n", Z_STRVAL($1));*/ }
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_STRING: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
   case 45:
 
-    { zend_ini_get_constant(&(yyval), &(yyvsp[(1) - (1)]) TSRMLS_CC); }
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_WHITESPACE: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
   case 46:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_RAW: '%s'\n", Z_STRVAL($1));*/ }
+    { zend_ini_get_constant(&(yyval), &(yyvsp[(1) - (1)]) TSRMLS_CC); }
     break;
 
   case 47:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_NUMBER: '%s'\n", Z_STRVAL($1));*/ }
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_RAW: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
   case 48:
 
-    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_STRING: '%s'\n", Z_STRVAL($1));*/ }
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_NUMBER: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
   case 49:
 
+    { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_STRING: '%s'\n", Z_STRVAL($1));*/ }
+    break;
+
+  case 50:
+
     { (yyval) = (yyvsp[(1) - (1)]); /*printf("TC_WHITESPACE: '%s'\n", Z_STRVAL($1));*/ }
     break;
 
diff --git a/Zend/zend_ini_parser.h b/Zend/zend_ini_parser.h
index 1e0c9a96d..ddfb49218 100644
--- a/Zend/zend_ini_parser.h
+++ b/Zend/zend_ini_parser.h
@@ -52,7 +52,8 @@
      TC_QUOTED_STRING = 268,
      BOOL_TRUE = 269,
      BOOL_FALSE = 270,
-     END_OF_LINE = 271
+     NULL_NULL = 271,
+     END_OF_LINE = 272
    };
 #endif
 /* Tokens.  */
@@ -69,7 +70,8 @@
 #define TC_QUOTED_STRING 268
 #define BOOL_TRUE 269
 #define BOOL_FALSE 270
-#define END_OF_LINE 271
+#define NULL_NULL 271
+#define END_OF_LINE 272
 
 
 
diff --git a/Zend/zend_ini_parser.output b/Zend/zend_ini_parser.output
index cfd6dd4af..241883c88 100644
--- a/Zend/zend_ini_parser.output
+++ b/Zend/zend_ini_parser.output
@@ -36,63 +36,64 @@ Grammar
    10 string_or_value: expr
    11                | BOOL_TRUE
    12                | BOOL_FALSE
-   13                | END_OF_LINE
-
-   14 option_offset: var_string_list
-   15              | /* empty */
-
-   16 encapsed_list: encapsed_list cfg_var_ref
-   17              | encapsed_list TC_QUOTED_STRING
-   18              | /* empty */
-
-   19 var_string_list_section: cfg_var_ref
-   20                        | constant_literal
-   21                        | '"' encapsed_list '"'
-   22                        | var_string_list_section cfg_var_ref
-   23                        | var_string_list_section constant_literal
-   24                        | var_string_list_section '"' encapsed_list '"'
-
-   25 var_string_list: cfg_var_ref
-   26                | constant_string
-   27                | '"' encapsed_list '"'
-   28                | var_string_list cfg_var_ref
-   29                | var_string_list constant_string
-   30                | var_string_list '"' encapsed_list '"'
-
-   31 expr: var_string_list
-   32     | expr '|' expr
-   33     | expr '&' expr
-   34     | expr '^' expr
-   35     | '~' expr
-   36     | '!' expr
-   37     | '(' expr ')'
-
-   38 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}'
-
-   39 constant_literal: TC_CONSTANT
-   40                 | TC_RAW
-   41                 | TC_NUMBER
-   42                 | TC_STRING
-   43                 | TC_WHITESPACE
-
-   44 constant_string: TC_CONSTANT
-   45                | TC_RAW
-   46                | TC_NUMBER
-   47                | TC_STRING
-   48                | TC_WHITESPACE
+   13                | NULL_NULL
+   14                | END_OF_LINE
+
+   15 option_offset: var_string_list
+   16              | /* empty */
+
+   17 encapsed_list: encapsed_list cfg_var_ref
+   18              | encapsed_list TC_QUOTED_STRING
+   19              | /* empty */
+
+   20 var_string_list_section: cfg_var_ref
+   21                        | constant_literal
+   22                        | '"' encapsed_list '"'
+   23                        | var_string_list_section cfg_var_ref
+   24                        | var_string_list_section constant_literal
+   25                        | var_string_list_section '"' encapsed_list '"'
+
+   26 var_string_list: cfg_var_ref
+   27                | constant_string
+   28                | '"' encapsed_list '"'
+   29                | var_string_list cfg_var_ref
+   30                | var_string_list constant_string
+   31                | var_string_list '"' encapsed_list '"'
+
+   32 expr: var_string_list
+   33     | expr '|' expr
+   34     | expr '&' expr
+   35     | expr '^' expr
+   36     | '~' expr
+   37     | '!' expr
+   38     | '(' expr ')'
+
+   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}'
+
+   40 constant_literal: TC_CONSTANT
+   41                 | TC_RAW
+   42                 | TC_NUMBER
+   43                 | TC_STRING
+   44                 | TC_WHITESPACE
+
+   45 constant_string: TC_CONSTANT
+   46                | TC_RAW
+   47                | TC_NUMBER
+   48                | TC_STRING
+   49                | TC_WHITESPACE
 
 
 Terminals, with rules where they appear
 
 $end (0) 0
-'!' (33) 36
-'"' (34) 21 24 27 30
+'!' (33) 37
+'"' (34) 22 25 28 31
 '$' (36)
 '%' (37)
-'&' (38) 33
+'&' (38) 34
 '\'' (39)
-'(' (40) 37
-')' (41) 37
+'(' (40) 38
+')' (41) 38
 '*' (42)
 '+' (43)
 ',' (44)
@@ -106,56 +107,57 @@ $end (0) 0
 '?' (63)
 '@' (64)
 ']' (93) 3 5
-'^' (94) 34
+'^' (94) 35
 '{' (123)
-'|' (124) 32
-'}' (125) 38
-'~' (126) 35
+'|' (124) 33
+'}' (125) 39
+'~' (126) 36
 error (256)
 TC_SECTION (258) 3
-TC_RAW (259) 40 45
-TC_CONSTANT (260) 39 44
-TC_NUMBER (261) 41 46
-TC_STRING (262) 42 47
-TC_WHITESPACE (263) 43 48
+TC_RAW (259) 41 46
+TC_CONSTANT (260) 40 45
+TC_NUMBER (261) 42 47
+TC_STRING (262) 43 48
+TC_WHITESPACE (263) 44 49
 TC_LABEL (264) 4 6
 TC_OFFSET (265) 5
-TC_DOLLAR_CURLY (266) 38
-TC_VARNAME (267) 38
-TC_QUOTED_STRING (268) 17
+TC_DOLLAR_CURLY (266) 39
+TC_VARNAME (267) 39
+TC_QUOTED_STRING (268) 18
 BOOL_TRUE (269) 11
 BOOL_FALSE (270) 12
-END_OF_LINE (271) 7 13
+NULL_NULL (271) 13
+END_OF_LINE (272) 7 14
 
 
 Nonterminals, with rules where they appear
 
-$accept (43)
+$accept (44)
     on left: 0
-statement_list (44)
+statement_list (45)
     on left: 1 2, on right: 0 1
-statement (45)
+statement (46)
     on left: 3 4 5 6 7, on right: 1
-section_string_or_value (46)
+section_string_or_value (47)
     on left: 8 9, on right: 3
-string_or_value (47)
-    on left: 10 11 12 13, on right: 4 5
-option_offset (48)
-    on left: 14 15, on right: 5
-encapsed_list (49)
-    on left: 16 17 18, on right: 16 17 21 24 27 30
-var_string_list_section (50)
-    on left: 19 20 21 22 23 24, on right: 8 22 23 24
-var_string_list (51)
-    on left: 25 26 27 28 29 30, on right: 14 28 29 30 31
-expr (52)
-    on left: 31 32 33 34 35 36 37, on right: 10 32 33 34 35 36 37
-cfg_var_ref (53)
-    on left: 38, on right: 16 19 22 25 28
-constant_literal (54)
-    on left: 39 40 41 42 43, on right: 20 23
-constant_string (55)
-    on left: 44 45 46 47 48, on right: 26 29
+string_or_value (48)
+    on left: 10 11 12 13 14, on right: 4 5
+option_offset (49)
+    on left: 15 16, on right: 5
+encapsed_list (50)
+    on left: 17 18 19, on right: 17 18 22 25 28 31
+var_string_list_section (51)
+    on left: 20 21 22 23 24 25, on right: 8 23 24 25
+var_string_list (52)
+    on left: 26 27 28 29 30 31, on right: 15 29 30 31 32
+expr (53)
+    on left: 32 33 34 35 36 37 38, on right: 10 33 34 35 36 37 38
+cfg_var_ref (54)
+    on left: 39, on right: 17 20 23 26 29
+constant_literal (55)
+    on left: 40 41 42 43 44, on right: 21 24
+constant_string (56)
+    on left: 45 46 47 48 49, on right: 27 30
 
 
 state 0
@@ -230,7 +232,7 @@ state 5
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
 
-    $default  reduce using rule 15 (option_offset)
+    $default  reduce using rule 16 (option_offset)
 
     option_offset    go to state 26
     var_string_list  go to state 27
@@ -254,51 +256,51 @@ state 7
 
 state 8
 
-   40 constant_literal: TC_RAW .
+   41 constant_literal: TC_RAW .
 
-    $default  reduce using rule 40 (constant_literal)
+    $default  reduce using rule 41 (constant_literal)
 
 
 state 9
 
-   39 constant_literal: TC_CONSTANT .
+   40 constant_literal: TC_CONSTANT .
 
-    $default  reduce using rule 39 (constant_literal)
+    $default  reduce using rule 40 (constant_literal)
 
 
 state 10
 
-   41 constant_literal: TC_NUMBER .
+   42 constant_literal: TC_NUMBER .
 
-    $default  reduce using rule 41 (constant_literal)
+    $default  reduce using rule 42 (constant_literal)
 
 
 state 11
 
-   42 constant_literal: TC_STRING .
+   43 constant_literal: TC_STRING .
 
-    $default  reduce using rule 42 (constant_literal)
+    $default  reduce using rule 43 (constant_literal)
 
 
 state 12
 
-   43 constant_literal: TC_WHITESPACE .
+   44 constant_literal: TC_WHITESPACE .
 
-    $default  reduce using rule 43 (constant_literal)
+    $default  reduce using rule 44 (constant_literal)
 
 
 state 13
 
-   38 cfg_var_ref: TC_DOLLAR_CURLY . TC_VARNAME '}'
+   39 cfg_var_ref: TC_DOLLAR_CURLY . TC_VARNAME '}'
 
     TC_VARNAME  shift, and go to state 30
 
 
 state 14
 
-   21 var_string_list_section: '"' . encapsed_list '"'
+   22 var_string_list_section: '"' . encapsed_list '"'
 
-    $default  reduce using rule 18 (encapsed_list)
+    $default  reduce using rule 19 (encapsed_list)
 
     encapsed_list  go to state 31
 
@@ -313,9 +315,9 @@ state 15
 state 16
 
     8 section_string_or_value: var_string_list_section .
-   22 var_string_list_section: var_string_list_section . cfg_var_ref
-   23                        | var_string_list_section . constant_literal
-   24                        | var_string_list_section . '"' encapsed_list '"'
+   23 var_string_list_section: var_string_list_section . cfg_var_ref
+   24                        | var_string_list_section . constant_literal
+   25                        | var_string_list_section . '"' encapsed_list '"'
 
     TC_RAW           shift, and go to state 8
     TC_CONSTANT      shift, and go to state 9
@@ -333,16 +335,16 @@ state 16
 
 state 17
 
-   19 var_string_list_section: cfg_var_ref .
+   20 var_string_list_section: cfg_var_ref .
 
-    $default  reduce using rule 19 (var_string_list_section)
+    $default  reduce using rule 20 (var_string_list_section)
 
 
 state 18
 
-   20 var_string_list_section: constant_literal .
+   21 var_string_list_section: constant_literal .
 
-    $default  reduce using rule 20 (var_string_list_section)
+    $default  reduce using rule 21 (var_string_list_section)
 
 
 state 19
@@ -357,76 +359,77 @@ state 19
     TC_DOLLAR_CURLY  shift, and go to state 13
     BOOL_TRUE        shift, and go to state 36
     BOOL_FALSE       shift, and go to state 37
-    END_OF_LINE      shift, and go to state 38
+    NULL_NULL        shift, and go to state 38
+    END_OF_LINE      shift, and go to state 39
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    string_or_value  go to state 42
-    var_string_list  go to state 43
-    expr             go to state 44
+    string_or_value  go to state 43
+    var_string_list  go to state 44
+    expr             go to state 45
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
 state 20
 
-   45 constant_string: TC_RAW .
+   46 constant_string: TC_RAW .
 
-    $default  reduce using rule 45 (constant_string)
+    $default  reduce using rule 46 (constant_string)
 
 
 state 21
 
-   44 constant_string: TC_CONSTANT .
+   45 constant_string: TC_CONSTANT .
 
-    $default  reduce using rule 44 (constant_string)
+    $default  reduce using rule 45 (constant_string)
 
 
 state 22
 
-   46 constant_string: TC_NUMBER .
+   47 constant_string: TC_NUMBER .
 
-    $default  reduce using rule 46 (constant_string)
+    $default  reduce using rule 47 (constant_string)
 
 
 state 23
 
-   47 constant_string: TC_STRING .
+   48 constant_string: TC_STRING .
 
-    $default  reduce using rule 47 (constant_string)
+    $default  reduce using rule 48 (constant_string)
 
 
 state 24
 
-   48 constant_string: TC_WHITESPACE .
+   49 constant_string: TC_WHITESPACE .
 
-    $default  reduce using rule 48 (constant_string)
+    $default  reduce using rule 49 (constant_string)
 
 
 state 25
 
-   27 var_string_list: '"' . encapsed_list '"'
+   28 var_string_list: '"' . encapsed_list '"'
 
-    $default  reduce using rule 18 (encapsed_list)
+    $default  reduce using rule 19 (encapsed_list)
 
-    encapsed_list  go to state 45
+    encapsed_list  go to state 46
 
 
 state 26
 
     5 statement: TC_OFFSET option_offset . ']' '=' string_or_value
 
-    ']'  shift, and go to state 46
+    ']'  shift, and go to state 47
 
 
 state 27
 
-   14 option_offset: var_string_list .
-   28 var_string_list: var_string_list . cfg_var_ref
-   29                | var_string_list . constant_string
-   30                | var_string_list . '"' encapsed_list '"'
+   15 option_offset: var_string_list .
+   29 var_string_list: var_string_list . cfg_var_ref
+   30                | var_string_list . constant_string
+   31                | var_string_list . '"' encapsed_list '"'
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -434,46 +437,46 @@ state 27
     TC_STRING        shift, and go to state 23
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
-    '"'              shift, and go to state 47
+    '"'              shift, and go to state 48
 
-    $default  reduce using rule 14 (option_offset)
+    $default  reduce using rule 15 (option_offset)
 
-    cfg_var_ref      go to state 48
-    constant_string  go to state 49
+    cfg_var_ref      go to state 49
+    constant_string  go to state 50
 
 
 state 28
 
-   25 var_string_list: cfg_var_ref .
+   26 var_string_list: cfg_var_ref .
 
-    $default  reduce using rule 25 (var_string_list)
+    $default  reduce using rule 26 (var_string_list)
 
 
 state 29
 
-   26 var_string_list: constant_string .
+   27 var_string_list: constant_string .
 
-    $default  reduce using rule 26 (var_string_list)
+    $default  reduce using rule 27 (var_string_list)
 
 
 state 30
 
-   38 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME . '}'
+   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME . '}'
 
-    '}'  shift, and go to state 50
+    '}'  shift, and go to state 51
 
 
 state 31
 
-   16 encapsed_list: encapsed_list . cfg_var_ref
-   17              | encapsed_list . TC_QUOTED_STRING
-   21 var_string_list_section: '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list . cfg_var_ref
+   18              | encapsed_list . TC_QUOTED_STRING
+   22 var_string_list_section: '"' encapsed_list . '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
-    TC_QUOTED_STRING  shift, and go to state 51
-    '"'               shift, and go to state 52
+    TC_QUOTED_STRING  shift, and go to state 52
+    '"'               shift, and go to state 53
 
-    cfg_var_ref  go to state 53
+    cfg_var_ref  go to state 54
 
 
 state 32
@@ -485,25 +488,25 @@ state 32
 
 state 33
 
-   24 var_string_list_section: var_string_list_section '"' . encapsed_list '"'
+   25 var_string_list_section: var_string_list_section '"' . encapsed_list '"'
 
-    $default  reduce using rule 18 (encapsed_list)
+    $default  reduce using rule 19 (encapsed_list)
 
-    encapsed_list  go to state 54
+    encapsed_list  go to state 55
 
 
 state 34
 
-   22 var_string_list_section: var_string_list_section cfg_var_ref .
+   23 var_string_list_section: var_string_list_section cfg_var_ref .
 
-    $default  reduce using rule 22 (var_string_list_section)
+    $default  reduce using rule 23 (var_string_list_section)
 
 
 state 35
 
-   23 var_string_list_section: var_string_list_section constant_literal .
+   24 var_string_list_section: var_string_list_section constant_literal .
 
-    $default  reduce using rule 23 (var_string_list_section)
+    $default  reduce using rule 24 (var_string_list_section)
 
 
 state 36
@@ -522,14 +525,21 @@ state 37
 
 state 38
 
-   13 string_or_value: END_OF_LINE .
+   13 string_or_value: NULL_NULL .
 
     $default  reduce using rule 13 (string_or_value)
 
 
 state 39
 
-   35 expr: '~' . expr
+   14 string_or_value: END_OF_LINE .
+
+    $default  reduce using rule 14 (string_or_value)
+
+
+state 40
+
+   36 expr: '~' . expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -538,19 +548,19 @@ state 39
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    var_string_list  go to state 43
-    expr             go to state 55
+    var_string_list  go to state 44
+    expr             go to state 56
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 40
+state 41
 
-   36 expr: '!' . expr
+   37 expr: '!' . expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -559,19 +569,19 @@ state 40
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    var_string_list  go to state 43
-    expr             go to state 56
+    var_string_list  go to state 44
+    expr             go to state 57
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 41
+state 42
 
-   37 expr: '(' . expr ')'
+   38 expr: '(' . expr ')'
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -580,29 +590,29 @@ state 41
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    var_string_list  go to state 43
-    expr             go to state 57
+    var_string_list  go to state 44
+    expr             go to state 58
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 42
+state 43
 
     4 statement: TC_LABEL '=' string_or_value .
 
     $default  reduce using rule 4 (statement)
 
 
-state 43
+state 44
 
-   28 var_string_list: var_string_list . cfg_var_ref
-   29                | var_string_list . constant_string
-   30                | var_string_list . '"' encapsed_list '"'
-   31 expr: var_string_list .
+   29 var_string_list: var_string_list . cfg_var_ref
+   30                | var_string_list . constant_string
+   31                | var_string_list . '"' encapsed_list '"'
+   32 expr: var_string_list .
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -610,148 +620,148 @@ state 43
     TC_STRING        shift, and go to state 23
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
-    '"'              shift, and go to state 47
+    '"'              shift, and go to state 48
 
-    $default  reduce using rule 31 (expr)
+    $default  reduce using rule 32 (expr)
 
-    cfg_var_ref      go to state 48
-    constant_string  go to state 49
+    cfg_var_ref      go to state 49
+    constant_string  go to state 50
 
 
-state 44
+state 45
 
    10 string_or_value: expr .
-   32 expr: expr . '|' expr
-   33     | expr . '&' expr
-   34     | expr . '^' expr
+   33 expr: expr . '|' expr
+   34     | expr . '&' expr
+   35     | expr . '^' expr
 
-    '^'  shift, and go to state 58
-    '|'  shift, and go to state 59
-    '&'  shift, and go to state 60
+    '^'  shift, and go to state 59
+    '|'  shift, and go to state 60
+    '&'  shift, and go to state 61
 
     $default  reduce using rule 10 (string_or_value)
 
 
-state 45
+state 46
 
-   16 encapsed_list: encapsed_list . cfg_var_ref
-   17              | encapsed_list . TC_QUOTED_STRING
-   27 var_string_list: '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list . cfg_var_ref
+   18              | encapsed_list . TC_QUOTED_STRING
+   28 var_string_list: '"' encapsed_list . '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
-    TC_QUOTED_STRING  shift, and go to state 51
-    '"'               shift, and go to state 61
-
-    cfg_var_ref  go to state 53
-
+    TC_QUOTED_STRING  shift, and go to state 52
+    '"'               shift, and go to state 62
 
-state 46
-
-    5 statement: TC_OFFSET option_offset ']' . '=' string_or_value
-
-    '='  shift, and go to state 62
+    cfg_var_ref  go to state 54
 
 
 state 47
 
-   30 var_string_list: var_string_list '"' . encapsed_list '"'
-
-    $default  reduce using rule 18 (encapsed_list)
+    5 statement: TC_OFFSET option_offset ']' . '=' string_or_value
 
-    encapsed_list  go to state 63
+    '='  shift, and go to state 63
 
 
 state 48
 
-   28 var_string_list: var_string_list cfg_var_ref .
+   31 var_string_list: var_string_list '"' . encapsed_list '"'
 
-    $default  reduce using rule 28 (var_string_list)
+    $default  reduce using rule 19 (encapsed_list)
+
+    encapsed_list  go to state 64
 
 
 state 49
 
-   29 var_string_list: var_string_list constant_string .
+   29 var_string_list: var_string_list cfg_var_ref .
 
     $default  reduce using rule 29 (var_string_list)
 
 
 state 50
 
-   38 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}' .
+   30 var_string_list: var_string_list constant_string .
 
-    $default  reduce using rule 38 (cfg_var_ref)
+    $default  reduce using rule 30 (var_string_list)
 
 
 state 51
 
-   17 encapsed_list: encapsed_list TC_QUOTED_STRING .
+   39 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}' .
 
-    $default  reduce using rule 17 (encapsed_list)
+    $default  reduce using rule 39 (cfg_var_ref)
 
 
 state 52
 
-   21 var_string_list_section: '"' encapsed_list '"' .
+   18 encapsed_list: encapsed_list TC_QUOTED_STRING .
 
-    $default  reduce using rule 21 (var_string_list_section)
+    $default  reduce using rule 18 (encapsed_list)
 
 
 state 53
 
-   16 encapsed_list: encapsed_list cfg_var_ref .
+   22 var_string_list_section: '"' encapsed_list '"' .
 
-    $default  reduce using rule 16 (encapsed_list)
+    $default  reduce using rule 22 (var_string_list_section)
 
 
 state 54
 
-   16 encapsed_list: encapsed_list . cfg_var_ref
-   17              | encapsed_list . TC_QUOTED_STRING
-   24 var_string_list_section: var_string_list_section '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list cfg_var_ref .
 
-    TC_DOLLAR_CURLY   shift, and go to state 13
-    TC_QUOTED_STRING  shift, and go to state 51
-    '"'               shift, and go to state 64
-
-    cfg_var_ref  go to state 53
+    $default  reduce using rule 17 (encapsed_list)
 
 
 state 55
 
-   32 expr: expr . '|' expr
-   33     | expr . '&' expr
-   34     | expr . '^' expr
-   35     | '~' expr .
+   17 encapsed_list: encapsed_list . cfg_var_ref
+   18              | encapsed_list . TC_QUOTED_STRING
+   25 var_string_list_section: var_string_list_section '"' encapsed_list . '"'
 
-    $default  reduce using rule 35 (expr)
+    TC_DOLLAR_CURLY   shift, and go to state 13
+    TC_QUOTED_STRING  shift, and go to state 52
+    '"'               shift, and go to state 65
+
+    cfg_var_ref  go to state 54
 
 
 state 56
 
-   32 expr: expr . '|' expr
-   33     | expr . '&' expr
-   34     | expr . '^' expr
-   36     | '!' expr .
+   33 expr: expr . '|' expr
+   34     | expr . '&' expr
+   35     | expr . '^' expr
+   36     | '~' expr .
 
     $default  reduce using rule 36 (expr)
 
 
 state 57
 
-   32 expr: expr . '|' expr
-   33     | expr . '&' expr
-   34     | expr . '^' expr
-   37     | '(' expr . ')'
+   33 expr: expr . '|' expr
+   34     | expr . '&' expr
+   35     | expr . '^' expr
+   37     | '!' expr .
 
-    '^'  shift, and go to state 58
-    '|'  shift, and go to state 59
-    '&'  shift, and go to state 60
-    ')'  shift, and go to state 65
+    $default  reduce using rule 37 (expr)
 
 
 state 58
 
-   34 expr: expr '^' . expr
+   33 expr: expr . '|' expr
+   34     | expr . '&' expr
+   35     | expr . '^' expr
+   38     | '(' expr . ')'
+
+    '^'  shift, and go to state 59
+    '|'  shift, and go to state 60
+    '&'  shift, and go to state 61
+    ')'  shift, and go to state 66
+
+
+state 59
+
+   35 expr: expr '^' . expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -760,19 +770,19 @@ state 58
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    var_string_list  go to state 43
-    expr             go to state 66
+    var_string_list  go to state 44
+    expr             go to state 67
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 59
+state 60
 
-   32 expr: expr '|' . expr
+   33 expr: expr '|' . expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -781,19 +791,19 @@ state 59
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    var_string_list  go to state 43
-    expr             go to state 67
+    var_string_list  go to state 44
+    expr             go to state 68
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 60
+state 61
 
-   33 expr: expr '&' . expr
+   34 expr: expr '&' . expr
 
     TC_RAW           shift, and go to state 20
     TC_CONSTANT      shift, and go to state 21
@@ -802,24 +812,24 @@ state 60
     TC_WHITESPACE    shift, and go to state 24
     TC_DOLLAR_CURLY  shift, and go to state 13
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    var_string_list  go to state 43
-    expr             go to state 68
+    var_string_list  go to state 44
+    expr             go to state 69
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 61
+state 62
 
-   27 var_string_list: '"' encapsed_list '"' .
+   28 var_string_list: '"' encapsed_list '"' .
 
-    $default  reduce using rule 27 (var_string_list)
+    $default  reduce using rule 28 (var_string_list)
 
 
-state 62
+state 63
 
     5 statement: TC_OFFSET option_offset ']' '=' . string_or_value
 
@@ -831,85 +841,86 @@ state 62
     TC_DOLLAR_CURLY  shift, and go to state 13
     BOOL_TRUE        shift, and go to state 36
     BOOL_FALSE       shift, and go to state 37
-    END_OF_LINE      shift, and go to state 38
+    NULL_NULL        shift, and go to state 38
+    END_OF_LINE      shift, and go to state 39
     '"'              shift, and go to state 25
-    '~'              shift, and go to state 39
-    '!'              shift, and go to state 40
-    '('              shift, and go to state 41
+    '~'              shift, and go to state 40
+    '!'              shift, and go to state 41
+    '('              shift, and go to state 42
 
-    string_or_value  go to state 69
-    var_string_list  go to state 43
-    expr             go to state 44
+    string_or_value  go to state 70
+    var_string_list  go to state 44
+    expr             go to state 45
     cfg_var_ref      go to state 28
     constant_string  go to state 29
 
 
-state 63
+state 64
 
-   16 encapsed_list: encapsed_list . cfg_var_ref
-   17              | encapsed_list . TC_QUOTED_STRING
-   30 var_string_list: var_string_list '"' encapsed_list . '"'
+   17 encapsed_list: encapsed_list . cfg_var_ref
+   18              | encapsed_list . TC_QUOTED_STRING
+   31 var_string_list: var_string_list '"' encapsed_list . '"'
 
     TC_DOLLAR_CURLY   shift, and go to state 13
-    TC_QUOTED_STRING  shift, and go to state 51
-    '"'               shift, and go to state 70
-
-    cfg_var_ref  go to state 53
-
-
-state 64
+    TC_QUOTED_STRING  shift, and go to state 52
+    '"'               shift, and go to state 71
 
-   24 var_string_list_section: var_string_list_section '"' encapsed_list '"' .
-
-    $default  reduce using rule 24 (var_string_list_section)
+    cfg_var_ref  go to state 54
 
 
 state 65
 
-   37 expr: '(' expr ')' .
+   25 var_string_list_section: var_string_list_section '"' encapsed_list '"' .
 
-    $default  reduce using rule 37 (expr)
+    $default  reduce using rule 25 (var_string_list_section)
 
 
 state 66
 
-   32 expr: expr . '|' expr
-   33     | expr . '&' expr
-   34     | expr . '^' expr
-   34     | expr '^' expr .
+   38 expr: '(' expr ')' .
 
-    $default  reduce using rule 34 (expr)
+    $default  reduce using rule 38 (expr)
 
 
 state 67
 
-   32 expr: expr . '|' expr
-   32     | expr '|' expr .
-   33     | expr . '&' expr
-   34     | expr . '^' expr
+   33 expr: expr . '|' expr
+   34     | expr . '&' expr
+   35     | expr . '^' expr
+   35     | expr '^' expr .
 
-    $default  reduce using rule 32 (expr)
+    $default  reduce using rule 35 (expr)
 
 
 state 68
 
-   32 expr: expr . '|' expr
-   33     | expr . '&' expr
-   33     | expr '&' expr .
-   34     | expr . '^' expr
+   33 expr: expr . '|' expr
+   33     | expr '|' expr .
+   34     | expr . '&' expr
+   35     | expr . '^' expr
 
     $default  reduce using rule 33 (expr)
 
 
 state 69
 
+   33 expr: expr . '|' expr
+   34     | expr . '&' expr
+   34     | expr '&' expr .
+   35     | expr . '^' expr
+
+    $default  reduce using rule 34 (expr)
+
+
+state 70
+
     5 statement: TC_OFFSET option_offset ']' '=' string_or_value .
 
     $default  reduce using rule 5 (statement)
 
 
-state 70
+state 71
 
-   30 var_string_list: var_string_list '"' encapsed_list '"' .
+   31 var_string_list: var_string_list '"' encapsed_list '"' .
 
-    $default  reduce using rule 30 (var_string_list)
+    $default  reduce using rule 31 (var_string_list)
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 3823efd41..952ef9c50 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -3,7 +3,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -29,6 +29,10 @@
 #include "zend_ini_scanner.h"
 #include "zend_extensions.h"
 
+#ifdef PHP_WIN32
+#include "win32/syslog.h"
+#endif
+
 #define YYERROR_VERBOSE
 #define YYSTYPE zval
 
@@ -179,10 +183,9 @@ static void ini_error(char *msg)
 
 	if (CG(ini_parser_unbuffered_errors)) {
 #ifdef PHP_WIN32
-		MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
-#else
-		fprintf(stderr, "PHP:  %s", error_buf);
+		syslog(LOG_ALERT, "PHP: %s (%s)", error_buf, GetCommandLine());
 #endif
+		fprintf(stderr, "PHP:  %s", error_buf);
 	} else {
 		zend_error(E_WARNING, "%s", error_buf);
 	}
@@ -265,6 +268,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 %token TC_QUOTED_STRING
 %token BOOL_TRUE
 %token BOOL_FALSE
+%token NULL_NULL
 %token END_OF_LINE
 %token '=' ':' ',' '.' '"' '\'' '^' '+' '-' '/' '*' '%' '$' '~' '<' '>' '?' '@' '{' '}'
 %left '|' '&' '^'
@@ -291,7 +295,7 @@ statement:
 #endif
 			ZEND_INI_PARSER_CB(&$1, &$3, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC);
 			free(Z_STRVAL($1));
-			free(Z_STRVAL($3));
+			zval_internal_dtor(&$3);
 		}
 	|	TC_OFFSET option_offset ']' '=' string_or_value {
 #if DEBUG_CFG_PARSER
@@ -300,7 +304,7 @@ statement:
 			ZEND_INI_PARSER_CB(&$1, &$5, &$2, ZEND_INI_PARSER_POP_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC);
 			free(Z_STRVAL($1));
 			free(Z_STRVAL($2));
-			free(Z_STRVAL($5));
+			zval_internal_dtor(&$5);
 		}
 	|	TC_LABEL	{ ZEND_INI_PARSER_CB(&$1, NULL, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG TSRMLS_CC); free(Z_STRVAL($1)); }
 	|	END_OF_LINE
@@ -315,6 +319,7 @@ string_or_value:
 		expr							{ $$ = $1; }
 	|	BOOL_TRUE						{ $$ = $1; }
 	|	BOOL_FALSE						{ $$ = $1; }
+	|	NULL_NULL						{ $$ = $1; }
 	|	END_OF_LINE						{ zend_ini_init_string(&$$); }
 ;
 
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index c73f3cedd..c4727d33e 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4663 +1,4827 @@
-/* Generated by re2c 0.13.5 */

-#line 1 "Zend/zend_ini_scanner.l"

-/*

-   +----------------------------------------------------------------------+

-   | Zend Engine                                                          |

-   +----------------------------------------------------------------------+

-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |

-   +----------------------------------------------------------------------+

-   | This source file is subject to version 2.00 of the Zend license,     |

-   | that is bundled with this package in the file LICENSE, and is        |

-   | available through the world-wide-web at the following url:           |

-   | http://www.zend.com/license/2_00.txt.                                |

-   | If you did not receive a copy of the Zend license and are unable to  |

-   | obtain it through the world-wide-web, please send a note to          |

-   | license@zend.com so we can mail you a copy immediately.              |

-   +----------------------------------------------------------------------+

-   | Authors: Zeev Suraski <zeev@zend.com>                                |

-   |          Jani Taskinen <jani@php.net>                                |

-   |          Marcus Boerger <helly@php.net>                              |

-   |          Nuno Lopes <nlopess@php.net>                                |

-   |          Scott MacVicar <scottmac@php.net>                           |

-   +----------------------------------------------------------------------+

-*/

-

-/* $Id$ */

-

-#include <errno.h>

-#include "zend.h"

-#include "zend_globals.h"

-#include <zend_ini_parser.h>

-#include "zend_ini_scanner.h"

-

-#if 0

-# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)

-#else

-# define YYDEBUG(s, c)

-#endif

-

-#include "zend_ini_scanner_defs.h"

-

-#define YYCTYPE   unsigned char

-/* allow the scanner to read one null byte after the end of the string (from ZEND_MMAP_AHEAD)

- * so that if will be able to terminate to match the current token (e.g. non-enclosed string) */

-#define YYFILL(n) { if (YYCURSOR > YYLIMIT) return 0; }

-#define YYCURSOR  SCNG(yy_cursor)

-#define YYLIMIT   SCNG(yy_limit)

-#define YYMARKER  SCNG(yy_marker)

-

-#define YYGETCONDITION()  SCNG(yy_state)

-#define YYSETCONDITION(s) SCNG(yy_state) = s

-

-#define STATE(name)  yyc##name

-

-/* emulate flex constructs */

-#define BEGIN(state) YYSETCONDITION(STATE(state))

-#define YYSTATE      YYGETCONDITION()

-#define yytext       ((char*)SCNG(yy_text))

-#define yyleng       SCNG(yy_leng)

-#define yyless(x)    do {	YYCURSOR = (unsigned char*)yytext + x; \

-							yyleng   = (unsigned int)x; } while(0)

-

-/* #define yymore()     goto yymore_restart */

-

-/* perform sanity check. If this message is triggered you should

-   increase the ZEND_MMAP_AHEAD value in the zend_streams.h file */

-#define YYMAXFILL 6

-#if ZEND_MMAP_AHEAD < (YYMAXFILL + 1)

-# error ZEND_MMAP_AHEAD should be greater than YYMAXFILL

-#endif

-

-

-/* How it works (for the core ini directives):

- * ===========================================

- *

- * 1. Scanner scans file for tokens and passes them to parser.

- * 2. Parser parses the tokens and passes the name/value pairs to the callback

- *    function which stores them in the configuration hash table.

- * 3. Later REGISTER_INI_ENTRIES() is called which triggers the actual

- *    registering of ini entries and uses zend_get_configuration_directive()

- *    to fetch the previously stored name/value pair from configuration hash table

- *    and registers the static ini entries which match the name to the value

- *    into EG(ini_directives) hash table.

- * 4. PATH section entries are used per-request from down to top, each overriding

- *    previous if one exists. zend_alter_ini_entry() is called for each entry.

- *    Settings in PATH section are ZEND_INI_SYSTEM accessible and thus mimics the

- *    php_admin_* directives used within Apache httpd.conf when PHP is compiled as

- *    module for Apache.

- * 5. User defined ini files (like .htaccess for apache) are parsed for each request and

- *    stored in separate hash defined by SAPI.

- */

-

-/* TODO: (ordered by importance :-)

- * ===============================================================================

- *

- *  - Separate constant lookup totally from plain strings (using CONSTANT pattern)

- *  - Add #if .. #else .. #endif and ==, !=, <, > , <=, >= operators

- *  - Add #include "some.ini"

- *  - Allow variables to refer to options also when using parse_ini_file()

- *

- */

-

-/* Globals Macros */

-#define SCNG	INI_SCNG

-#ifdef ZTS

-ZEND_API ts_rsrc_id ini_scanner_globals_id;

-#else

-ZEND_API zend_ini_scanner_globals ini_scanner_globals;

-#endif

-

-/* Eat leading whitespace */

-#define EAT_LEADING_WHITESPACE()                     \

-	while (yytext[0]) {                              \

-		if (yytext[0] == ' ' || yytext[0] == '\t') { \

-			SCNG(yy_text)++;                         \

-			yyleng--;                                \

-		} else {                                     \

-			break;                                   \

-		}                                            \

-	}

-

-/* Eat trailing whitespace + extra char */

-#define EAT_TRAILING_WHITESPACE_EX(ch)              \

-	while (yyleng > 0 && (                          \

-		(ch != 'X' && yytext[yyleng - 1] ==  ch) || \

-		yytext[yyleng - 1] == '\n' ||               \

-		yytext[yyleng - 1] == '\r' ||               \

-		yytext[yyleng - 1] == '\t' ||               \

-		yytext[yyleng - 1] == ' ')                  \

-	) {                                             \

-		yyleng--;                                   \

-	}

-

-/* Eat trailing whitespace */

-#define EAT_TRAILING_WHITESPACE()	EAT_TRAILING_WHITESPACE_EX('X')

-

-#define zend_ini_copy_value(retval, str, len) {  \

-	Z_STRVAL_P(retval) = zend_strndup(str, len); \

-	Z_STRLEN_P(retval) = len;                    \

-	Z_TYPE_P(retval) = IS_STRING;                \

-}

-

-#define RETURN_TOKEN(type, str, len) {           \

-	zend_ini_copy_value(ini_lval, str, len);     \

-	return type;                                 \

-}

-

-static void _yy_push_state(int new_state TSRMLS_DC)

-{

-	zend_stack_push(&SCNG(state_stack), (void *) &YYGETCONDITION(), sizeof(int));

-	YYSETCONDITION(new_state);

-}

-

-#define yy_push_state(state_and_tsrm) _yy_push_state(yyc##state_and_tsrm)

-

-static void yy_pop_state(TSRMLS_D)

-{

-	int *stack_state;

-	zend_stack_top(&SCNG(state_stack), (void **) &stack_state);

-	YYSETCONDITION(*stack_state);

-	zend_stack_del_top(&SCNG(state_stack));

-}

-

-static void yy_scan_buffer(char *str, unsigned int len TSRMLS_DC)

-{

-	YYCURSOR = (YYCTYPE*)str;

-	SCNG(yy_start) = YYCURSOR;

-	YYLIMIT  = YYCURSOR + len;

-}

-

-#define ini_filename SCNG(filename)

-

-/* {{{ init_ini_scanner()

-*/

-static int init_ini_scanner(int scanner_mode, zend_file_handle *fh TSRMLS_DC)

-{

-	/* Sanity check */

-	if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW) {

-		zend_error(E_WARNING, "Invalid scanner mode");

-		return FAILURE;

-	}

-

-	SCNG(lineno) = 1;

-	SCNG(scanner_mode) = scanner_mode;

-	SCNG(yy_in) = fh;

-

-	if (fh != NULL) {

-		ini_filename = zend_strndup(fh->filename, strlen(fh->filename));

-	} else {

-		ini_filename = NULL;

-	}

-

-	zend_stack_init(&SCNG(state_stack));

-	BEGIN(INITIAL);

-

-	return SUCCESS;

-}

-/* }}} */

-

-/* {{{ shutdown_ini_scanner()

-*/

-void shutdown_ini_scanner(TSRMLS_D)

-{

-	zend_stack_destroy(&SCNG(state_stack));

-	if (ini_filename) {

-		free(ini_filename);

-	}

-}

-/* }}} */

-

-/* {{{ zend_ini_scanner_get_lineno()

-*/

-int zend_ini_scanner_get_lineno(TSRMLS_D)

-{

-	return SCNG(lineno);

-}

-/* }}} */

-

-/* {{{ zend_ini_scanner_get_filename()

-*/

-char *zend_ini_scanner_get_filename(TSRMLS_D)

-{

-	return ini_filename ? ini_filename : "Unknown";

-}

-/* }}} */

-

-/* {{{ zend_ini_open_file_for_scanning()

-*/

-int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode TSRMLS_DC)

-{

-	char *buf;

-	size_t size;

-

-	if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE) {

-		return FAILURE;

-	}

-

-	if (init_ini_scanner(scanner_mode, fh TSRMLS_CC) == FAILURE) {

-		zend_file_handle_dtor(fh TSRMLS_CC);

-		return FAILURE;

-	}

-

-	yy_scan_buffer(buf, size TSRMLS_CC);

-

-	return SUCCESS;

-}

-/* }}} */

-

-/* {{{ zend_ini_prepare_string_for_scanning()

-*/

-int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode TSRMLS_DC)

-{

-	int len = strlen(str);

-

-	if (init_ini_scanner(scanner_mode, NULL TSRMLS_CC) == FAILURE) {

-		return FAILURE;

-	}

-

-	yy_scan_buffer(str, len TSRMLS_CC);

-

-	return SUCCESS;

-}

-/* }}} */

-

-/* {{{ zend_ini_escape_string()

- */

-static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_type TSRMLS_DC)

-{

-	register char *s, *t;

-	char *end;

-

-	zend_ini_copy_value(lval, str, len);

-

-	/* convert escape sequences */

-	s = t = Z_STRVAL_P(lval);

-	end = s + Z_STRLEN_P(lval);

-

-	while (s < end) {

-		if (*s == '\\') {

-			s++;

-			if (s >= end) {

-				*t++ = '\\';

-				continue;

-			}

-			switch (*s) {

-				case '"':

-					if (*s != quote_type) {

-						*t++ = '\\';

-						*t++ = *s;

-						break;

-					}

-				case '\\':

-				case '$':

-					*t++ = *s;

-					Z_STRLEN_P(lval)--;

-					break;

-				default:

-					*t++ = '\\';

-					*t++ = *s;

-					break;

-			}

-		} else {

-			*t++ = *s;

-		}

-		if (*s == '\n' || (*s == '\r' && (*(s+1) != '\n'))) {

-			SCNG(lineno)++;

-		}

-		s++;

-	}

-	*t = 0;

-}

-/* }}} */

-

-int ini_lex(zval *ini_lval TSRMLS_DC)

-{

-restart:

-	SCNG(yy_text) = YYCURSOR;

-

-/* yymore_restart: */

-	/* detect EOF */

-	if (YYCURSOR >= YYLIMIT) {

-		if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) {

-			BEGIN(INITIAL);

-			return END_OF_LINE;

-		}

-		return 0;

-	}

-

-	/* Eat any UTF-8 BOM we find in the first 3 bytes */

-	if (YYCURSOR == SCNG(yy_start) && YYCURSOR + 3 < YYLIMIT) {

-		if (memcmp(YYCURSOR, "\xef\xbb\xbf", 3) == 0) {

-			YYCURSOR += 3;

-			goto restart;

-		}

-	}

-

-#line 337 "Zend/zend_ini_scanner.c"

-{

-	YYCTYPE yych;

-	unsigned int yyaccept = 0;

-	if (YYGETCONDITION() < 4) {

-		if (YYGETCONDITION() < 2) {

-			if (YYGETCONDITION() < 1) {

-				goto yyc_INITIAL;

-			} else {

-				goto yyc_ST_OFFSET;

-			}

-		} else {

-			if (YYGETCONDITION() < 3) {

-				goto yyc_ST_SECTION_VALUE;

-			} else {

-				goto yyc_ST_VALUE;

-			}

-		}

-	} else {

-		if (YYGETCONDITION() < 6) {

-			if (YYGETCONDITION() < 5) {

-				goto yyc_ST_SECTION_RAW;

-			} else {

-				goto yyc_ST_DOUBLE_QUOTES;

-			}

-		} else {

-			if (YYGETCONDITION() < 7) {

-				goto yyc_ST_VARNAME;

-			} else {

-				goto yyc_ST_RAW;

-			}

-		}

-	}

-/* *********************************** */

-yyc_INITIAL:

-	{

-		static const unsigned char yybm[] = {

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 160,   0, 144, 144,   0, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			240, 128, 128, 144, 128, 144, 128, 144, 

-			128, 128, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 128, 144, 128, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 128, 144, 144, 128, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 128, 128, 128, 128, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-			144, 144, 144, 144, 144, 144, 144, 144, 

-		};

-

-		YYDEBUG(0, *YYCURSOR);

-		YYFILL(5);

-		yych = *YYCURSOR;

-		YYDEBUG(-1, yych);

-		switch (yych) {

-		case '\t':	goto yy4;

-		case '\n':	goto yy6;

-		case '\r':	goto yy8;

-		case ' ':	goto yy9;

-		case '!':

-		case '"':

-		case '$':

-		case '&':

-		case '(':

-		case ')':

-		case '^':

-		case '{':

-		case '|':

-		case '}':

-		case '~':	goto yy10;

-		case '#':	goto yy12;

-		case '%':

-		case '\'':

-		case '*':

-		case '+':

-		case ',':

-		case '-':

-		case '.':

-		case '/':

-		case ':':

-		case '<':

-		case '>':

-		case '?':

-		case '@':

-		case ']':	goto yy13;

-		case ';':	goto yy14;

-		case '=':	goto yy16;

-		case 'F':

-		case 'f':	goto yy18;

-		case 'N':

-		case 'n':	goto yy19;

-		case 'O':

-		case 'o':	goto yy20;

-		case 'T':

-		case 't':	goto yy21;

-		case 'Y':

-		case 'y':	goto yy22;

-		case '[':	goto yy23;

-		default:	goto yy2;

-		}

-yy2:

-		YYDEBUG(2, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy26;

-yy3:

-		YYDEBUG(3, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 429 "Zend/zend_ini_scanner.l"

-		{ /* Get option name */

-	/* Eat leading whitespace */

-	EAT_LEADING_WHITESPACE();

-

-	/* Eat trailing whitespace */

-	EAT_TRAILING_WHITESPACE();

-

-	RETURN_TOKEN(TC_LABEL, yytext, yyleng);

-}

-#line 476 "Zend/zend_ini_scanner.c"

-yy4:

-		YYDEBUG(4, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy68;

-yy5:

-		YYDEBUG(5, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 575 "Zend/zend_ini_scanner.l"

-		{

-	/* eat whitespace */

-	goto restart;

-}

-#line 490 "Zend/zend_ini_scanner.c"

-yy6:

-		YYDEBUG(6, *YYCURSOR);

-		++YYCURSOR;

-yy7:

-		YYDEBUG(7, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 580 "Zend/zend_ini_scanner.l"

-		{

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 502 "Zend/zend_ini_scanner.c"

-yy8:

-		YYDEBUG(8, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy71;

-		goto yy7;

-yy9:

-		YYDEBUG(9, *YYCURSOR);

-		yyaccept = 1;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= ' ') {

-			if (yych <= '\n') {

-				if (yych <= 0x08) goto yy26;

-				if (yych <= '\t') goto yy67;

-				goto yy71;

-			} else {

-				if (yych == '\r') goto yy72;

-				if (yych <= 0x1F) goto yy26;

-				goto yy69;

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych == '#') goto yy58;

-				goto yy26;

-			} else {

-				if (yych <= ';') goto yy53;

-				if (yych == '=') goto yy51;

-				goto yy26;

-			}

-		}

-yy10:

-		YYDEBUG(10, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(11, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 503 "Zend/zend_ini_scanner.l"

-		{ /* Disallow these chars outside option values */

-	return yytext[0];

-}

-#line 541 "Zend/zend_ini_scanner.c"

-yy12:

-		YYDEBUG(12, *YYCURSOR);

-		yyaccept = 1;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy59;

-yy13:

-		YYDEBUG(13, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy26;

-yy14:

-		YYDEBUG(14, *YYCURSOR);

-		yyaccept = 2;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy54;

-		YYDEBUG(15, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 603 "Zend/zend_ini_scanner.l"

-		{

-	return 0;

-}

-#line 562 "Zend/zend_ini_scanner.c"

-yy16:

-		YYDEBUG(16, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy52;

-yy17:

-		YYDEBUG(17, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 439 "Zend/zend_ini_scanner.l"

-		{ /* Start option value */

-	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {

-		yy_push_state(ST_RAW TSRMLS_CC);

-	} else {

-		yy_push_state(ST_VALUE TSRMLS_CC);

-	}

-	return '=';

-}

-#line 580 "Zend/zend_ini_scanner.c"

-yy18:

-		YYDEBUG(18, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'A') goto yy48;

-		if (yych == 'a') goto yy48;

-		goto yy26;

-yy19:

-		YYDEBUG(19, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych <= 'U') {

-			if (yych == 'O') goto yy44;

-			if (yych <= 'T') goto yy26;

-			goto yy45;

-		} else {

-			if (yych <= 'o') {

-				if (yych <= 'n') goto yy26;

-				goto yy44;

-			} else {

-				if (yych == 'u') goto yy45;

-				goto yy26;

-			}

-		}

-yy20:

-		YYDEBUG(20, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych <= 'N') {

-			if (yych == 'F') goto yy38;

-			if (yych <= 'M') goto yy26;

-			goto yy31;

-		} else {

-			if (yych <= 'f') {

-				if (yych <= 'e') goto yy26;

-				goto yy38;

-			} else {

-				if (yych == 'n') goto yy31;

-				goto yy26;

-			}

-		}

-yy21:

-		YYDEBUG(21, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'R') goto yy36;

-		if (yych == 'r') goto yy36;

-		goto yy26;

-yy22:

-		YYDEBUG(22, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'E') goto yy27;

-		if (yych == 'e') goto yy27;

-		goto yy26;

-yy23:

-		YYDEBUG(23, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(24, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 358 "Zend/zend_ini_scanner.l"

-		{ /* Section start */

-	/* Enter section data lookup state */

-	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {

-		yy_push_state(ST_SECTION_RAW TSRMLS_CC);

-	} else {

-		yy_push_state(ST_SECTION_VALUE TSRMLS_CC);

-	}

-	return TC_SECTION;

-}

-#line 646 "Zend/zend_ini_scanner.c"

-yy25:

-		YYDEBUG(25, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy26:

-		YYDEBUG(26, *YYCURSOR);

-		if (yybm[0+yych] & 16) {

-			goto yy25;

-		}

-		if (yych == '[') goto yy28;

-		goto yy3;

-yy27:

-		YYDEBUG(27, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'S') goto yy31;

-		if (yych == 's') goto yy31;

-		goto yy26;

-yy28:

-		YYDEBUG(28, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(29, *YYCURSOR);

-		if (yybm[0+yych] & 32) {

-			goto yy28;

-		}

-		YYDEBUG(30, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 383 "Zend/zend_ini_scanner.l"

-		{ /* Start of option with offset */

-	/* Eat leading whitespace */

-	EAT_LEADING_WHITESPACE();

-	

-	/* Eat trailing whitespace and [ */

-	EAT_TRAILING_WHITESPACE_EX('[');

-

-	/* Enter offset lookup state */

-	yy_push_state(ST_OFFSET TSRMLS_CC);

-

-	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);

-}

-#line 689 "Zend/zend_ini_scanner.c"

-yy31:

-		YYDEBUG(31, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(32, *YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy31;

-		}

-		if (yych <= '\'') {

-			if (yych <= ' ') {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy25;

-					if (yych <= '\t') goto yy34;

-				} else {

-					if (yych != '\r') goto yy25;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych == '#') goto yy25;

-				} else {

-					if (yych != '&') goto yy25;

-				}

-			}

-		} else {

-			if (yych <= 'Z') {

-				if (yych <= ';') {

-					if (yych <= ')') goto yy33;

-					if (yych <= ':') goto yy25;

-				} else {

-					if (yych != '=') goto yy25;

-				}

-			} else {

-				if (yych <= '^') {

-					if (yych <= '[') goto yy28;

-					if (yych <= ']') goto yy25;

-				} else {

-					if (yych <= 'z') goto yy25;

-					if (yych >= 0x7F) goto yy25;

-				}

-			}

-		}

-yy33:

-		YYDEBUG(33, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 421 "Zend/zend_ini_scanner.l"

-		{ /* TRUE value (when used outside option value/offset this causes parse error!) */

-	RETURN_TOKEN(BOOL_TRUE, "1", 1);

-}

-#line 739 "Zend/zend_ini_scanner.c"

-yy34:

-		YYDEBUG(34, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(35, *YYCURSOR);

-		if (yych == '\t') goto yy34;

-		if (yych == ' ') goto yy34;

-		goto yy33;

-yy36:

-		YYDEBUG(36, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'U') goto yy37;

-		if (yych != 'u') goto yy26;

-yy37:

-		YYDEBUG(37, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'E') goto yy31;

-		if (yych == 'e') goto yy31;

-		goto yy26;

-yy38:

-		YYDEBUG(38, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'F') goto yy39;

-		if (yych != 'f') goto yy26;

-yy39:

-		YYDEBUG(39, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(40, *YYCURSOR);

-		if (yych <= '&') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy25;

-					if (yych <= '\t') goto yy42;

-				} else {

-					if (yych != '\r') goto yy25;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= ' ') goto yy39;

-					if (yych >= '#') goto yy25;

-				} else {

-					if (yych == '%') goto yy25;

-				}

-			}

-		} else {

-			if (yych <= '=') {

-				if (yych <= ':') {

-					if (yych <= '\'') goto yy25;

-					if (yych >= '*') goto yy25;

-				} else {

-					if (yych == '<') goto yy25;

-				}

-			} else {

-				if (yych <= ']') {

-					if (yych == '[') goto yy28;

-					goto yy25;

-				} else {

-					if (yych <= '^') goto yy41;

-					if (yych <= 'z') goto yy25;

-					if (yych >= 0x7F) goto yy25;

-				}

-			}

-		}

-yy41:

-		YYDEBUG(41, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 425 "Zend/zend_ini_scanner.l"

-		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/

-	RETURN_TOKEN(BOOL_FALSE, "", 0);

-}

-#line 813 "Zend/zend_ini_scanner.c"

-yy42:

-		YYDEBUG(42, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(43, *YYCURSOR);

-		if (yych == '\t') goto yy42;

-		if (yych == ' ') goto yy42;

-		goto yy41;

-yy44:

-		YYDEBUG(44, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych <= '\'') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy26;

-					if (yych <= '\t') goto yy42;

-					goto yy41;

-				} else {

-					if (yych == '\r') goto yy41;

-					goto yy26;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= ' ') goto yy39;

-					if (yych <= '"') goto yy41;

-					goto yy26;

-				} else {

-					if (yych == '%') goto yy26;

-					if (yych <= '&') goto yy41;

-					goto yy26;

-				}

-			}

-		} else {

-			if (yych <= 'N') {

-				if (yych <= ';') {

-					if (yych <= ')') goto yy41;

-					if (yych <= ':') goto yy26;

-					goto yy41;

-				} else {

-					if (yych == '=') goto yy41;

-					if (yych <= 'M') goto yy26;

-					goto yy47;

-				}

-			} else {

-				if (yych <= 'm') {

-					if (yych == '^') goto yy41;

-					goto yy26;

-				} else {

-					if (yych <= 'n') goto yy47;

-					if (yych <= 'z') goto yy26;

-					if (yych <= '~') goto yy41;

-					goto yy26;

-				}

-			}

-		}

-yy45:

-		YYDEBUG(45, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'L') goto yy46;

-		if (yych != 'l') goto yy26;

-yy46:

-		YYDEBUG(46, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'L') goto yy39;

-		if (yych == 'l') goto yy39;

-		goto yy26;

-yy47:

-		YYDEBUG(47, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'E') goto yy39;

-		if (yych == 'e') goto yy39;

-		goto yy26;

-yy48:

-		YYDEBUG(48, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'L') goto yy49;

-		if (yych != 'l') goto yy26;

-yy49:

-		YYDEBUG(49, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'S') goto yy50;

-		if (yych != 's') goto yy26;

-yy50:

-		YYDEBUG(50, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == 'E') goto yy39;

-		if (yych == 'e') goto yy39;

-		goto yy26;

-yy51:

-		YYDEBUG(51, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy52:

-		YYDEBUG(52, *YYCURSOR);

-		if (yych == '\t') goto yy51;

-		if (yych == ' ') goto yy51;

-		goto yy17;

-yy53:

-		YYDEBUG(53, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy54:

-		YYDEBUG(54, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy53;

-		}

-		if (yych >= '\r') goto yy57;

-yy55:

-		YYDEBUG(55, *YYCURSOR);

-		++YYCURSOR;

-yy56:

-		YYDEBUG(56, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 585 "Zend/zend_ini_scanner.l"

-		{ /* Comment */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 936 "Zend/zend_ini_scanner.c"

-yy57:

-		YYDEBUG(57, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy55;

-		goto yy56;

-yy58:

-		YYDEBUG(58, *YYCURSOR);

-		yyaccept = 1;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy59:

-		YYDEBUG(59, *YYCURSOR);

-		if (yych <= '\'') {

-			if (yych <= ' ') {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy58;

-					if (yych >= '\n') goto yy64;

-				} else {

-					if (yych == '\r') goto yy66;

-					goto yy58;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych == '#') goto yy58;

-				} else {

-					if (yych != '&') goto yy58;

-				}

-			}

-		} else {

-			if (yych <= 'Z') {

-				if (yych <= ';') {

-					if (yych <= ')') goto yy60;

-					if (yych <= ':') goto yy58;

-				} else {

-					if (yych != '=') goto yy58;

-				}

-			} else {

-				if (yych <= '^') {

-					if (yych <= '[') goto yy62;

-					if (yych <= ']') goto yy58;

-				} else {

-					if (yych <= 'z') goto yy58;

-					if (yych >= 0x7F) goto yy58;

-				}

-			}

-		}

-yy60:

-		YYDEBUG(60, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-		YYDEBUG(61, *YYCURSOR);

-		if (yych == '\n') goto yy64;

-		if (yych == '\r') goto yy66;

-		goto yy60;

-yy62:

-		YYDEBUG(62, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-		YYDEBUG(63, *YYCURSOR);

-		if (yych <= '\f') {

-			if (yych <= 0x08) goto yy60;

-			if (yych <= '\t') goto yy62;

-			if (yych >= '\v') goto yy60;

-		} else {

-			if (yych <= '\r') goto yy66;

-			if (yych == ' ') goto yy62;

-			goto yy60;

-		}

-yy64:

-		YYDEBUG(64, *YYCURSOR);

-		++YYCURSOR;

-yy65:

-		YYDEBUG(65, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 591 "Zend/zend_ini_scanner.l"

-		{ /* #Comment */

-	zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 1022 "Zend/zend_ini_scanner.c"

-yy66:

-		YYDEBUG(66, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy64;

-		goto yy65;

-yy67:

-		YYDEBUG(67, *YYCURSOR);

-		yyaccept = 0;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy68:

-		YYDEBUG(68, *YYCURSOR);

-		if (yych <= ' ') {

-			if (yych <= '\n') {

-				if (yych <= 0x08) goto yy5;

-				if (yych <= '\t') goto yy67;

-				goto yy71;

-			} else {

-				if (yych == '\r') goto yy72;

-				if (yych <= 0x1F) goto yy5;

-				goto yy67;

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych == '#') goto yy60;

-				goto yy5;

-			} else {

-				if (yych <= ';') goto yy53;

-				if (yych == '=') goto yy51;

-				goto yy5;

-			}

-		}

-yy69:

-		YYDEBUG(69, *YYCURSOR);

-		yyaccept = 1;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-		YYDEBUG(70, *YYCURSOR);

-		if (yych <= '&') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy25;

-					if (yych <= '\t') goto yy67;

-				} else {

-					if (yych == '\r') goto yy72;

-					goto yy25;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= ' ') goto yy69;

-					if (yych <= '"') goto yy3;

-					goto yy58;

-				} else {

-					if (yych == '%') goto yy25;

-					goto yy3;

-				}

-			}

-		} else {

-			if (yych <= '=') {

-				if (yych <= ':') {

-					if (yych <= '\'') goto yy25;

-					if (yych <= ')') goto yy3;

-					goto yy25;

-				} else {

-					if (yych <= ';') goto yy53;

-					if (yych <= '<') goto yy25;

-					goto yy51;

-				}

-			} else {

-				if (yych <= ']') {

-					if (yych == '[') goto yy28;

-					goto yy25;

-				} else {

-					if (yych <= '^') goto yy3;

-					if (yych <= 'z') goto yy25;

-					if (yych <= '~') goto yy3;

-					goto yy25;

-				}

-			}

-		}

-yy71:

-		YYDEBUG(71, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy7;

-yy72:

-		YYDEBUG(72, *YYCURSOR);

-		++YYCURSOR;

-		if ((yych = *YYCURSOR) == '\n') goto yy71;

-		goto yy7;

-	}

-/* *********************************** */

-yyc_ST_DOUBLE_QUOTES:

-	{

-		static const unsigned char yybm[] = {

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0, 128,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			128,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-			  0,   0,   0,   0,   0,   0,   0,   0, 

-		};

-		YYDEBUG(73, *YYCURSOR);

-		YYFILL(2);

-		yych = *YYCURSOR;

-		if (yych == '"') goto yy77;

-		if (yych == '$') goto yy79;

-		YYDEBUG(75, *YYCURSOR);

-		++YYCURSOR;

-yy76:

-		YYDEBUG(76, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 535 "Zend/zend_ini_scanner.l"

-		{ /* Escape double quoted string contents */

-	if (YYCURSOR > YYLIMIT) {

-		return 0;

-	}

-	

-	while (YYCURSOR < YYLIMIT) {

-		switch (*YYCURSOR++) {

-			case '"':

-				if (YYCURSOR < YYLIMIT && YYCURSOR[-2] == '\\' && *YYCURSOR != '\r' && *YYCURSOR != '\n') {

-					continue;

-				}

-				break;

-			case '$':

-				if (*YYCURSOR == '{') {

-					break;

-				}

-				continue;

-			case '\\':

-				if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {

-					YYCURSOR++;

-				}

-				/* fall through */

-			default:

-				continue;

-		}

-		

-		YYCURSOR--;

-		break;

-	}

-

-	yyleng = YYCURSOR - SCNG(yy_text);

-	

-	zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);

-	return TC_QUOTED_STRING;

-}

-#line 1198 "Zend/zend_ini_scanner.c"

-yy77:

-		YYDEBUG(77, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy83;

-yy78:

-		YYDEBUG(78, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 530 "Zend/zend_ini_scanner.l"

-		{ /* Double quoted '"' string ends */

-	yy_pop_state(TSRMLS_C);

-	return '"';

-}

-#line 1212 "Zend/zend_ini_scanner.c"

-yy79:

-		YYDEBUG(79, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych != '{') goto yy76;

-		YYDEBUG(80, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(81, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 401 "Zend/zend_ini_scanner.l"

-		{ /* Variable start */

-	yy_push_state(ST_VARNAME TSRMLS_CC);

-	return TC_DOLLAR_CURLY;

-}

-#line 1226 "Zend/zend_ini_scanner.c"

-yy82:

-		YYDEBUG(82, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy83:

-		YYDEBUG(83, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy82;

-		}

-		goto yy78;

-	}

-/* *********************************** */

-yyc_ST_OFFSET:

-	{

-		static const unsigned char yybm[] = {

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66, 194,  64,  66,  66,  64,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			194,  66,  64,  66,  68,  66,  66,   0, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			114, 114, 114, 114, 114, 114, 114, 114, 

-			114, 114,  66,  64,  66,  66,  66,  66, 

-			 66,  82,  82,  82,  82,  82,  82,  82, 

-			 82,  82,  82,  82,  82,  82,  82,  82, 

-			 82,  82,  82,  82,  82,  82,  82,  82, 

-			 82,  82,  82,  66,  72,  64,  66,  82, 

-			 66,  82,  82,  82,  82,  82,  82,  82, 

-			 82,  82,  82,  82,  82,  82,  82,  82, 

-			 82,  82,  82,  82,  82,  82,  82,  82, 

-			 82,  82,  82,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-			 66,  66,  66,  66,  66,  66,  66,  66, 

-		};

-		YYDEBUG(84, *YYCURSOR);

-		YYFILL(2);

-		yych = *YYCURSOR;

-		if (yych <= '-') {

-			if (yych <= ' ') {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy86;

-					if (yych <= '\t') goto yy88;

-					goto yy89;

-				} else {

-					if (yych == '\r') goto yy89;

-					if (yych >= ' ') goto yy88;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych == '"') goto yy91;

-					if (yych >= '$') goto yy93;

-				} else {

-					if (yych == '\'') goto yy94;

-					if (yych >= '-') goto yy95;

-				}

-			}

-		} else {

-			if (yych <= 'Z') {

-				if (yych <= '9') {

-					if (yych <= '.') goto yy96;

-					if (yych >= '0') goto yy97;

-				} else {

-					if (yych == ';') goto yy89;

-					if (yych >= 'A') goto yy99;

-				}

-			} else {

-				if (yych <= '^') {

-					if (yych <= '[') goto yy86;

-					if (yych <= '\\') goto yy101;

-					if (yych <= ']') goto yy102;

-				} else {

-					if (yych == '`') goto yy86;

-					if (yych <= 'z') goto yy99;

-				}

-			}

-		}

-yy86:

-		YYDEBUG(86, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy105;

-yy87:

-		YYDEBUG(87, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 521 "Zend/zend_ini_scanner.l"

-		{ /* Get rest as section/offset value */

-	RETURN_TOKEN(TC_STRING, yytext, yyleng);

-}

-#line 1330 "Zend/zend_ini_scanner.c"

-yy88:

-		YYDEBUG(88, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy131;

-		}

-		if (yych == '"') goto yy133;

-		if (yych == ']') goto yy134;

-		goto yy105;

-yy89:

-		YYDEBUG(89, *YYCURSOR);

-		++YYCURSOR;

-yy90:

-		YYDEBUG(90, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 603 "Zend/zend_ini_scanner.l"

-		{

-	return 0;

-}

-#line 1351 "Zend/zend_ini_scanner.c"

-yy91:

-		YYDEBUG(91, *YYCURSOR);

-		++YYCURSOR;

-yy92:

-		YYDEBUG(92, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 525 "Zend/zend_ini_scanner.l"

-		{ /* Double quoted '"' string start */

-	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);

-	return '"';

-}

-#line 1363 "Zend/zend_ini_scanner.c"

-yy93:

-		YYDEBUG(93, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych <= '\\') {

-			if (yych <= 0x00) goto yy90;

-			if (yych <= '[') goto yy104;

-			goto yy109;

-		} else {

-			if (yych == '{') goto yy129;

-			goto yy104;

-		}

-yy94:

-		YYDEBUG(94, *YYCURSOR);

-		yyaccept = 1;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy125;

-		}

-		goto yy90;

-yy95:

-		YYDEBUG(95, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') goto yy105;

-		if (yych <= '9') goto yy123;

-		goto yy105;

-yy96:

-		YYDEBUG(96, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') goto yy105;

-		if (yych <= '9') goto yy121;

-		goto yy105;

-yy97:

-		YYDEBUG(97, *YYCURSOR);

-		yyaccept = 2;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '\'') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy98;

-				if (yych <= '\f') goto yy105;

-			} else {

-				if (yych == '"') goto yy98;

-				if (yych <= '&') goto yy105;

-			}

-		} else {

-			if (yych <= '9') {

-				if (yych == '.') goto yy117;

-				if (yych <= '/') goto yy105;

-				goto yy119;

-			} else {

-				if (yych <= ';') {

-					if (yych <= ':') goto yy105;

-				} else {

-					if (yych != ']') goto yy105;

-				}

-			}

-		}

-yy98:

-		YYDEBUG(98, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 499 "Zend/zend_ini_scanner.l"

-		{ /* Get number option value as string */

-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);

-}

-#line 1429 "Zend/zend_ini_scanner.c"

-yy99:

-		YYDEBUG(99, *YYCURSOR);

-		yyaccept = 3;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 16) {

-			goto yy115;

-		}

-		if (yych <= '"') {

-			if (yych <= '\f') {

-				if (yych != '\n') goto yy105;

-			} else {

-				if (yych <= '\r') goto yy100;

-				if (yych <= '!') goto yy105;

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych != '\'') goto yy105;

-			} else {

-				if (yych <= ';') goto yy100;

-				if (yych != ']') goto yy105;

-			}

-		}

-yy100:

-		YYDEBUG(100, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 495 "Zend/zend_ini_scanner.l"

-		{ /* Get constant option value */

-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);

-}

-#line 1459 "Zend/zend_ini_scanner.c"

-yy101:

-		YYDEBUG(101, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy104;

-yy102:

-		YYDEBUG(102, *YYCURSOR);

-		++YYCURSOR;

-yy103:

-		YYDEBUG(103, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 396 "Zend/zend_ini_scanner.l"

-		{ /* End of section or an option offset */

-	BEGIN(INITIAL);

-	return ']';

-}

-#line 1475 "Zend/zend_ini_scanner.c"

-yy104:

-		YYDEBUG(104, *YYCURSOR);

-		yyaccept = 0;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy105:

-		YYDEBUG(105, *YYCURSOR);

-		if (yybm[0+yych] & 2) {

-			goto yy104;

-		}

-		if (yych == '$') goto yy107;

-		if (yych != '\\') goto yy87;

-yy106:

-		YYDEBUG(106, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		goto yy104;

-yy107:

-		YYDEBUG(107, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yych <= '\\') {

-			if (yych <= 0x00) goto yy108;

-			if (yych <= '[') goto yy104;

-			goto yy109;

-		} else {

-			if (yych != '{') goto yy104;

-		}

-yy108:

-		YYDEBUG(108, *YYCURSOR);

-		YYCURSOR = YYMARKER;

-		if (yyaccept <= 1) {

-			if (yyaccept <= 0) {

-				goto yy87;

-			} else {

-				goto yy90;

-			}

-		} else {

-			if (yyaccept <= 2) {

-				goto yy98;

-			} else {

-				goto yy100;

-			}

-		}

-yy109:

-		YYDEBUG(109, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yybm[0+yych] & 4) {

-			goto yy110;

-		}

-		if (yych == '\\') goto yy112;

-		goto yy104;

-yy110:

-		YYDEBUG(110, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(111, *YYCURSOR);

-		if (yybm[0+yych] & 4) {

-			goto yy110;

-		}

-		if (yych == '\\') goto yy114;

-		goto yy104;

-yy112:

-		YYDEBUG(112, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(113, *YYCURSOR);

-		if (yybm[0+yych] & 4) {

-			goto yy110;

-		}

-		if (yych == '\\') goto yy112;

-		goto yy104;

-yy114:

-		YYDEBUG(114, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yybm[0+yych] & 4) {

-			goto yy110;

-		}

-		if (yych == '\\') goto yy112;

-		goto yy104;

-yy115:

-		YYDEBUG(115, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(116, *YYCURSOR);

-		if (yybm[0+yych] & 16) {

-			goto yy115;

-		}

-		if (yych <= '$') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy100;

-				if (yych <= '\f') goto yy104;

-				goto yy100;

-			} else {

-				if (yych == '"') goto yy100;

-				if (yych <= '#') goto yy104;

-				goto yy107;

-			}

-		} else {

-			if (yych <= ';') {

-				if (yych == '\'') goto yy100;

-				if (yych <= ':') goto yy104;

-				goto yy100;

-			} else {

-				if (yych <= '[') goto yy104;

-				if (yych <= '\\') goto yy106;

-				if (yych <= ']') goto yy100;

-				goto yy104;

-			}

-		}

-yy117:

-		YYDEBUG(117, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(118, *YYCURSOR);

-		if (yybm[0+yych] & 32) {

-			goto yy117;

-		}

-		if (yych <= '$') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy98;

-				if (yych <= '\f') goto yy104;

-				goto yy98;

-			} else {

-				if (yych == '"') goto yy98;

-				if (yych <= '#') goto yy104;

-				goto yy107;

-			}

-		} else {

-			if (yych <= ';') {

-				if (yych == '\'') goto yy98;

-				if (yych <= ':') goto yy104;

-				goto yy98;

-			} else {

-				if (yych <= '[') goto yy104;

-				if (yych <= '\\') goto yy106;

-				if (yych <= ']') goto yy98;

-				goto yy104;

-			}

-		}

-yy119:

-		YYDEBUG(119, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(120, *YYCURSOR);

-		if (yych <= '\'') {

-			if (yych <= '!') {

-				if (yych <= '\n') {

-					if (yych <= '\t') goto yy104;

-					goto yy98;

-				} else {

-					if (yych == '\r') goto yy98;

-					goto yy104;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= '"') goto yy98;

-					goto yy104;

-				} else {

-					if (yych <= '$') goto yy107;

-					if (yych <= '&') goto yy104;

-					goto yy98;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '.') {

-					if (yych <= '-') goto yy104;

-					goto yy117;

-				} else {

-					if (yych <= '/') goto yy104;

-					if (yych <= '9') goto yy119;

-					goto yy104;

-				}

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy98;

-					goto yy104;

-				} else {

-					if (yych <= '\\') goto yy106;

-					if (yych <= ']') goto yy98;

-					goto yy104;

-				}

-			}

-		}

-yy121:

-		YYDEBUG(121, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(122, *YYCURSOR);

-		if (yych <= '&') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy98;

-				if (yych <= '\f') goto yy104;

-				goto yy98;

-			} else {

-				if (yych <= '"') {

-					if (yych <= '!') goto yy104;

-					goto yy98;

-				} else {

-					if (yych == '$') goto yy107;

-					goto yy104;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '\'') goto yy98;

-				if (yych <= '/') goto yy104;

-				if (yych <= '9') goto yy121;

-				goto yy104;

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy98;

-					goto yy104;

-				} else {

-					if (yych <= '\\') goto yy106;

-					if (yych <= ']') goto yy98;

-					goto yy104;

-				}

-			}

-		}

-yy123:

-		YYDEBUG(123, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(124, *YYCURSOR);

-		if (yych <= '&') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy98;

-				if (yych <= '\f') goto yy104;

-				goto yy98;

-			} else {

-				if (yych <= '"') {

-					if (yych <= '!') goto yy104;

-					goto yy98;

-				} else {

-					if (yych == '$') goto yy107;

-					goto yy104;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '\'') goto yy98;

-				if (yych <= '/') goto yy104;

-				if (yych <= '9') goto yy123;

-				goto yy104;

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy98;

-					goto yy104;

-				} else {

-					if (yych <= '\\') goto yy106;

-					if (yych <= ']') goto yy98;

-					goto yy104;

-				}

-			}

-		}

-yy125:

-		YYDEBUG(125, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(126, *YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy125;

-		}

-		YYDEBUG(127, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(128, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 368 "Zend/zend_ini_scanner.l"

-		{ /* Raw string */

-	/* Eat leading and trailing single quotes */

-	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {

-		SCNG(yy_text)++;

-		yyleng = yyleng - 2;

-	}

-	RETURN_TOKEN(TC_RAW, yytext, yyleng);

-}

-#line 1774 "Zend/zend_ini_scanner.c"

-yy129:

-		YYDEBUG(129, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(130, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 401 "Zend/zend_ini_scanner.l"

-		{ /* Variable start */

-	yy_push_state(ST_VARNAME TSRMLS_CC);

-	return TC_DOLLAR_CURLY;

-}

-#line 1785 "Zend/zend_ini_scanner.c"

-yy131:

-		YYDEBUG(131, *YYCURSOR);

-		yyaccept = 0;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(132, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy131;

-		}

-		if (yych <= '$') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy87;

-				if (yych <= '\f') goto yy104;

-				goto yy87;

-			} else {

-				if (yych == '"') goto yy133;

-				if (yych <= '#') goto yy104;

-				goto yy107;

-			}

-		} else {

-			if (yych <= ';') {

-				if (yych == '\'') goto yy87;

-				if (yych <= ':') goto yy104;

-				goto yy87;

-			} else {

-				if (yych <= '[') goto yy104;

-				if (yych <= '\\') goto yy106;

-				if (yych <= ']') goto yy134;

-				goto yy104;

-			}

-		}

-yy133:

-		YYDEBUG(133, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy92;

-yy134:

-		YYDEBUG(134, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy103;

-	}

-/* *********************************** */

-yyc_ST_RAW:

-	{

-		static const unsigned char yybm[] = {

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64, 192,   0,  64,  64,   0,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			192,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-			 64,  64,  64,  64,  64,  64,  64,  64, 

-		};

-		YYDEBUG(135, *YYCURSOR);

-		YYFILL(3);

-		yych = *YYCURSOR;

-		if (yych <= '\f') {

-			if (yych <= 0x08) {

-				if (yych >= 0x01) goto yy139;

-			} else {

-				if (yych <= '\t') goto yy141;

-				if (yych <= '\n') goto yy142;

-				goto yy139;

-			}

-		} else {

-			if (yych <= ' ') {

-				if (yych <= '\r') goto yy144;

-				if (yych <= 0x1F) goto yy139;

-				goto yy141;

-			} else {

-				if (yych == ';') goto yy145;

-				goto yy139;

-			}

-		}

-		YYDEBUG(137, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(138, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 598 "Zend/zend_ini_scanner.l"

-		{ /* End of option value (if EOF is reached before EOL */

-	BEGIN(INITIAL);

-	return END_OF_LINE;

-}

-#line 1895 "Zend/zend_ini_scanner.c"

-yy139:

-		YYDEBUG(139, *YYCURSOR);

-		++YYCURSOR;

-yy140:

-		YYDEBUG(140, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 448 "Zend/zend_ini_scanner.l"

-		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */

-	char *sc = NULL;

-	while (YYCURSOR < YYLIMIT) {

-		switch (*YYCURSOR) {

-			case '\n':

-			case '\r':

-				goto end_raw_value_chars;

-				break;

-			case ';':

-				if (sc == NULL) {

-					sc = YYCURSOR;

-				}

-				/* no break */

-			default:

-				YYCURSOR++;

-				break;

-		}

-	}

-end_raw_value_chars:

-	yyleng = YYCURSOR - SCNG(yy_text);

-

-	/* Eat trailing semicolons */

-	while (yytext[yyleng - 1] == ';') {

-		yyleng--;

-	}

-

-	/* Eat leading and trailing double quotes */

-	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {

-		SCNG(yy_text)++;

-		yyleng = yyleng - 2;

-	} else if (sc) {

-		YYCURSOR = sc;

-		yyleng = YYCURSOR - SCNG(yy_text);

-	}

-	RETURN_TOKEN(TC_RAW, yytext, yyleng);

-}

-#line 1939 "Zend/zend_ini_scanner.c"

-yy141:

-		YYDEBUG(141, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '\r') {

-			if (yych <= 0x08) goto yy140;

-			if (yych <= '\n') goto yy153;

-			if (yych <= '\f') goto yy140;

-			goto yy153;

-		} else {

-			if (yych <= ' ') {

-				if (yych <= 0x1F) goto yy140;

-				goto yy153;

-			} else {

-				if (yych == ';') goto yy153;

-				goto yy140;

-			}

-		}

-yy142:

-		YYDEBUG(142, *YYCURSOR);

-		++YYCURSOR;

-yy143:

-		YYDEBUG(143, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 489 "Zend/zend_ini_scanner.l"

-		{ /* End of option value */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 1970 "Zend/zend_ini_scanner.c"

-yy144:

-		YYDEBUG(144, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy151;

-		goto yy143;

-yy145:

-		YYDEBUG(145, *YYCURSOR);

-		yyaccept = 1;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy147;

-yy146:

-		YYDEBUG(146, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy147:

-		YYDEBUG(147, *YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy146;

-		}

-		if (yych >= '\r') goto yy150;

-yy148:

-		YYDEBUG(148, *YYCURSOR);

-		++YYCURSOR;

-yy149:

-		YYDEBUG(149, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 585 "Zend/zend_ini_scanner.l"

-		{ /* Comment */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 2004 "Zend/zend_ini_scanner.c"

-yy150:

-		YYDEBUG(150, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy148;

-		goto yy149;

-yy151:

-		YYDEBUG(151, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy143;

-yy152:

-		YYDEBUG(152, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy153:

-		YYDEBUG(153, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy152;

-		}

-		if (yych <= '\f') {

-			if (yych == '\n') goto yy151;

-		} else {

-			if (yych <= '\r') goto yy155;

-			if (yych == ';') goto yy146;

-		}

-		YYDEBUG(154, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 575 "Zend/zend_ini_scanner.l"

-		{

-	/* eat whitespace */

-	goto restart;

-}

-#line 2038 "Zend/zend_ini_scanner.c"

-yy155:

-		YYDEBUG(155, *YYCURSOR);

-		++YYCURSOR;

-		if ((yych = *YYCURSOR) == '\n') goto yy151;

-		goto yy143;

-	}

-/* *********************************** */

-yyc_ST_SECTION_RAW:

-	{

-		static const unsigned char yybm[] = {

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 192,   0, 128, 128,   0, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			192, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128,   0, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-		};

-		YYDEBUG(156, *YYCURSOR);

-		YYFILL(3);

-		yych = *YYCURSOR;

-		if (yych <= '\f') {

-			if (yych == '\n') goto yy160;

-		} else {

-			if (yych <= '\r') goto yy160;

-			if (yych == ']') goto yy162;

-		}

-		YYDEBUG(158, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy169;

-yy159:

-		YYDEBUG(159, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 485 "Zend/zend_ini_scanner.l"

-		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */

-	RETURN_TOKEN(TC_RAW, yytext, yyleng);

-}

-#line 2102 "Zend/zend_ini_scanner.c"

-yy160:

-		YYDEBUG(160, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(161, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 603 "Zend/zend_ini_scanner.l"

-		{

-	return 0;

-}

-#line 2112 "Zend/zend_ini_scanner.c"

-yy162:

-		YYDEBUG(162, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy165;

-yy163:

-		YYDEBUG(163, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 377 "Zend/zend_ini_scanner.l"

-		{ /* End of section */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return ']';

-}

-#line 2127 "Zend/zend_ini_scanner.c"

-yy164:

-		YYDEBUG(164, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy165:

-		YYDEBUG(165, *YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy164;

-		}

-		if (yych == '\n') goto yy166;

-		if (yych == '\r') goto yy167;

-		goto yy163;

-yy166:

-		YYDEBUG(166, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy163;

-yy167:

-		YYDEBUG(167, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy166;

-		goto yy163;

-yy168:

-		YYDEBUG(168, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy169:

-		YYDEBUG(169, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy168;

-		}

-		goto yy159;

-	}

-/* *********************************** */

-yyc_ST_SECTION_VALUE:

-	{

-		static const unsigned char yybm[] = {

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 134, 128, 132, 132, 128, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			134, 132, 128, 132, 136, 132, 132,   0, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			228, 228, 228, 228, 228, 228, 228, 228, 

-			228, 228, 132, 128, 132, 132, 132, 132, 

-			132, 164, 164, 164, 164, 164, 164, 164, 

-			164, 164, 164, 164, 164, 164, 164, 164, 

-			164, 164, 164, 164, 164, 164, 164, 164, 

-			164, 164, 164, 132, 144, 128, 132, 164, 

-			132, 164, 164, 164, 164, 164, 164, 164, 

-			164, 164, 164, 164, 164, 164, 164, 164, 

-			164, 164, 164, 164, 164, 164, 164, 164, 

-			164, 164, 164, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-			132, 132, 132, 132, 132, 132, 132, 132, 

-		};

-		YYDEBUG(170, *YYCURSOR);

-		YYFILL(3);

-		yych = *YYCURSOR;

-		if (yych <= '-') {

-			if (yych <= ' ') {

-				if (yych <= '\n') {

-					if (yych <= 0x08) goto yy172;

-					if (yych <= '\t') goto yy174;

-					goto yy175;

-				} else {

-					if (yych == '\r') goto yy175;

-					if (yych >= ' ') goto yy174;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych == '"') goto yy177;

-					if (yych >= '$') goto yy179;

-				} else {

-					if (yych == '\'') goto yy180;

-					if (yych >= '-') goto yy181;

-				}

-			}

-		} else {

-			if (yych <= 'Z') {

-				if (yych <= '9') {

-					if (yych <= '.') goto yy182;

-					if (yych >= '0') goto yy183;

-				} else {

-					if (yych == ';') goto yy175;

-					if (yych >= 'A') goto yy185;

-				}

-			} else {

-				if (yych <= '^') {

-					if (yych <= '[') goto yy172;

-					if (yych <= '\\') goto yy187;

-					if (yych <= ']') goto yy188;

-				} else {

-					if (yych == '`') goto yy172;

-					if (yych <= 'z') goto yy185;

-				}

-			}

-		}

-yy172:

-		YYDEBUG(172, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy195;

-yy173:

-		YYDEBUG(173, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 521 "Zend/zend_ini_scanner.l"

-		{ /* Get rest as section/offset value */

-	RETURN_TOKEN(TC_STRING, yytext, yyleng);

-}

-#line 2253 "Zend/zend_ini_scanner.c"

-yy174:

-		YYDEBUG(174, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= 0x1F) {

-			if (yych == '\t') goto yy221;

-			goto yy195;

-		} else {

-			if (yych <= ' ') goto yy221;

-			if (yych == '"') goto yy223;

-			goto yy195;

-		}

-yy175:

-		YYDEBUG(175, *YYCURSOR);

-		++YYCURSOR;

-yy176:

-		YYDEBUG(176, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 603 "Zend/zend_ini_scanner.l"

-		{

-	return 0;

-}

-#line 2276 "Zend/zend_ini_scanner.c"

-yy177:

-		YYDEBUG(177, *YYCURSOR);

-		++YYCURSOR;

-yy178:

-		YYDEBUG(178, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 525 "Zend/zend_ini_scanner.l"

-		{ /* Double quoted '"' string start */

-	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);

-	return '"';

-}

-#line 2288 "Zend/zend_ini_scanner.c"

-yy179:

-		YYDEBUG(179, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych <= '\\') {

-			if (yych <= 0x00) goto yy176;

-			if (yych <= '[') goto yy194;

-			goto yy199;

-		} else {

-			if (yych == '{') goto yy219;

-			goto yy194;

-		}

-yy180:

-		YYDEBUG(180, *YYCURSOR);

-		yyaccept = 1;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy215;

-		}

-		goto yy176;

-yy181:

-		YYDEBUG(181, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') goto yy195;

-		if (yych <= '9') goto yy213;

-		goto yy195;

-yy182:

-		YYDEBUG(182, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') goto yy195;

-		if (yych <= '9') goto yy211;

-		goto yy195;

-yy183:

-		YYDEBUG(183, *YYCURSOR);

-		yyaccept = 2;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '\'') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy184;

-				if (yych <= '\f') goto yy195;

-			} else {

-				if (yych == '"') goto yy184;

-				if (yych <= '&') goto yy195;

-			}

-		} else {

-			if (yych <= '9') {

-				if (yych == '.') goto yy207;

-				if (yych <= '/') goto yy195;

-				goto yy209;

-			} else {

-				if (yych <= ';') {

-					if (yych <= ':') goto yy195;

-				} else {

-					if (yych != ']') goto yy195;

-				}

-			}

-		}

-yy184:

-		YYDEBUG(184, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 499 "Zend/zend_ini_scanner.l"

-		{ /* Get number option value as string */

-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);

-}

-#line 2354 "Zend/zend_ini_scanner.c"

-yy185:

-		YYDEBUG(185, *YYCURSOR);

-		yyaccept = 3;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 32) {

-			goto yy205;

-		}

-		if (yych <= '"') {

-			if (yych <= '\f') {

-				if (yych != '\n') goto yy195;

-			} else {

-				if (yych <= '\r') goto yy186;

-				if (yych <= '!') goto yy195;

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych != '\'') goto yy195;

-			} else {

-				if (yych <= ';') goto yy186;

-				if (yych != ']') goto yy195;

-			}

-		}

-yy186:

-		YYDEBUG(186, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 495 "Zend/zend_ini_scanner.l"

-		{ /* Get constant option value */

-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);

-}

-#line 2384 "Zend/zend_ini_scanner.c"

-yy187:

-		YYDEBUG(187, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy194;

-yy188:

-		YYDEBUG(188, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy191;

-yy189:

-		YYDEBUG(189, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 377 "Zend/zend_ini_scanner.l"

-		{ /* End of section */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return ']';

-}

-#line 2403 "Zend/zend_ini_scanner.c"

-yy190:

-		YYDEBUG(190, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy191:

-		YYDEBUG(191, *YYCURSOR);

-		if (yybm[0+yych] & 2) {

-			goto yy190;

-		}

-		if (yych == '\n') goto yy192;

-		if (yych == '\r') goto yy193;

-		goto yy189;

-yy192:

-		YYDEBUG(192, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy189;

-yy193:

-		YYDEBUG(193, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy192;

-		goto yy189;

-yy194:

-		YYDEBUG(194, *YYCURSOR);

-		yyaccept = 0;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy195:

-		YYDEBUG(195, *YYCURSOR);

-		if (yybm[0+yych] & 4) {

-			goto yy194;

-		}

-		if (yych == '$') goto yy197;

-		if (yych != '\\') goto yy173;

-yy196:

-		YYDEBUG(196, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		goto yy194;

-yy197:

-		YYDEBUG(197, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yych <= '\\') {

-			if (yych <= 0x00) goto yy198;

-			if (yych <= '[') goto yy194;

-			goto yy199;

-		} else {

-			if (yych != '{') goto yy194;

-		}

-yy198:

-		YYDEBUG(198, *YYCURSOR);

-		YYCURSOR = YYMARKER;

-		if (yyaccept <= 1) {

-			if (yyaccept <= 0) {

-				goto yy173;

-			} else {

-				goto yy176;

-			}

-		} else {

-			if (yyaccept <= 2) {

-				goto yy184;

-			} else {

-				goto yy186;

-			}

-		}

-yy199:

-		YYDEBUG(199, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yybm[0+yych] & 8) {

-			goto yy200;

-		}

-		if (yych == '\\') goto yy202;

-		goto yy194;

-yy200:

-		YYDEBUG(200, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(201, *YYCURSOR);

-		if (yybm[0+yych] & 8) {

-			goto yy200;

-		}

-		if (yych == '\\') goto yy204;

-		goto yy194;

-yy202:

-		YYDEBUG(202, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(203, *YYCURSOR);

-		if (yybm[0+yych] & 8) {

-			goto yy200;

-		}

-		if (yych == '\\') goto yy202;

-		goto yy194;

-yy204:

-		YYDEBUG(204, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yybm[0+yych] & 8) {

-			goto yy200;

-		}

-		if (yych == '\\') goto yy202;

-		goto yy194;

-yy205:

-		YYDEBUG(205, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(206, *YYCURSOR);

-		if (yybm[0+yych] & 32) {

-			goto yy205;

-		}

-		if (yych <= '$') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy186;

-				if (yych <= '\f') goto yy194;

-				goto yy186;

-			} else {

-				if (yych == '"') goto yy186;

-				if (yych <= '#') goto yy194;

-				goto yy197;

-			}

-		} else {

-			if (yych <= ';') {

-				if (yych == '\'') goto yy186;

-				if (yych <= ':') goto yy194;

-				goto yy186;

-			} else {

-				if (yych <= '[') goto yy194;

-				if (yych <= '\\') goto yy196;

-				if (yych <= ']') goto yy186;

-				goto yy194;

-			}

-		}

-yy207:

-		YYDEBUG(207, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(208, *YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy207;

-		}

-		if (yych <= '$') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy184;

-				if (yych <= '\f') goto yy194;

-				goto yy184;

-			} else {

-				if (yych == '"') goto yy184;

-				if (yych <= '#') goto yy194;

-				goto yy197;

-			}

-		} else {

-			if (yych <= ';') {

-				if (yych == '\'') goto yy184;

-				if (yych <= ':') goto yy194;

-				goto yy184;

-			} else {

-				if (yych <= '[') goto yy194;

-				if (yych <= '\\') goto yy196;

-				if (yych <= ']') goto yy184;

-				goto yy194;

-			}

-		}

-yy209:

-		YYDEBUG(209, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(210, *YYCURSOR);

-		if (yych <= '\'') {

-			if (yych <= '!') {

-				if (yych <= '\n') {

-					if (yych <= '\t') goto yy194;

-					goto yy184;

-				} else {

-					if (yych == '\r') goto yy184;

-					goto yy194;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= '"') goto yy184;

-					goto yy194;

-				} else {

-					if (yych <= '$') goto yy197;

-					if (yych <= '&') goto yy194;

-					goto yy184;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '.') {

-					if (yych <= '-') goto yy194;

-					goto yy207;

-				} else {

-					if (yych <= '/') goto yy194;

-					if (yych <= '9') goto yy209;

-					goto yy194;

-				}

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy184;

-					goto yy194;

-				} else {

-					if (yych <= '\\') goto yy196;

-					if (yych <= ']') goto yy184;

-					goto yy194;

-				}

-			}

-		}

-yy211:

-		YYDEBUG(211, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(212, *YYCURSOR);

-		if (yych <= '&') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy184;

-				if (yych <= '\f') goto yy194;

-				goto yy184;

-			} else {

-				if (yych <= '"') {

-					if (yych <= '!') goto yy194;

-					goto yy184;

-				} else {

-					if (yych == '$') goto yy197;

-					goto yy194;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '\'') goto yy184;

-				if (yych <= '/') goto yy194;

-				if (yych <= '9') goto yy211;

-				goto yy194;

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy184;

-					goto yy194;

-				} else {

-					if (yych <= '\\') goto yy196;

-					if (yych <= ']') goto yy184;

-					goto yy194;

-				}

-			}

-		}

-yy213:

-		YYDEBUG(213, *YYCURSOR);

-		yyaccept = 2;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(214, *YYCURSOR);

-		if (yych <= '&') {

-			if (yych <= '\r') {

-				if (yych == '\n') goto yy184;

-				if (yych <= '\f') goto yy194;

-				goto yy184;

-			} else {

-				if (yych <= '"') {

-					if (yych <= '!') goto yy194;

-					goto yy184;

-				} else {

-					if (yych == '$') goto yy197;

-					goto yy194;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '\'') goto yy184;

-				if (yych <= '/') goto yy194;

-				if (yych <= '9') goto yy213;

-				goto yy194;

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy184;

-					goto yy194;

-				} else {

-					if (yych <= '\\') goto yy196;

-					if (yych <= ']') goto yy184;

-					goto yy194;

-				}

-			}

-		}

-yy215:

-		YYDEBUG(215, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(216, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy215;

-		}

-		YYDEBUG(217, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(218, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 368 "Zend/zend_ini_scanner.l"

-		{ /* Raw string */

-	/* Eat leading and trailing single quotes */

-	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {

-		SCNG(yy_text)++;

-		yyleng = yyleng - 2;

-	}

-	RETURN_TOKEN(TC_RAW, yytext, yyleng);

-}

-#line 2724 "Zend/zend_ini_scanner.c"

-yy219:

-		YYDEBUG(219, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(220, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 401 "Zend/zend_ini_scanner.l"

-		{ /* Variable start */

-	yy_push_state(ST_VARNAME TSRMLS_CC);

-	return TC_DOLLAR_CURLY;

-}

-#line 2735 "Zend/zend_ini_scanner.c"

-yy221:

-		YYDEBUG(221, *YYCURSOR);

-		yyaccept = 0;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(222, *YYCURSOR);

-		if (yych <= '"') {

-			if (yych <= '\f') {

-				if (yych <= 0x08) goto yy194;

-				if (yych <= '\t') goto yy221;

-				if (yych <= '\n') goto yy173;

-				goto yy194;

-			} else {

-				if (yych <= 0x1F) {

-					if (yych <= '\r') goto yy173;

-					goto yy194;

-				} else {

-					if (yych <= ' ') goto yy221;

-					if (yych <= '!') goto yy194;

-				}

-			}

-		} else {

-			if (yych <= ':') {

-				if (yych <= '$') {

-					if (yych <= '#') goto yy194;

-					goto yy197;

-				} else {

-					if (yych == '\'') goto yy173;

-					goto yy194;

-				}

-			} else {

-				if (yych <= '[') {

-					if (yych <= ';') goto yy173;

-					goto yy194;

-				} else {

-					if (yych <= '\\') goto yy196;

-					if (yych <= ']') goto yy173;

-					goto yy194;

-				}

-			}

-		}

-yy223:

-		YYDEBUG(223, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy178;

-	}

-/* *********************************** */

-yyc_ST_VALUE:

-	{

-		static const unsigned char yybm[] = {

-			160, 162, 162, 162, 162, 162, 162, 162, 

-			162, 176, 128, 162, 162, 128, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			176, 160, 160, 162, 168, 162, 160,  32, 

-			160, 160, 162, 162, 162, 162, 162, 162, 

-			230, 230, 230, 230, 230, 230, 230, 230, 

-			230, 230, 162, 160, 162, 160, 162, 162, 

-			162, 166, 166, 166, 166, 166, 166, 166, 

-			166, 166, 166, 166, 166, 166, 166, 166, 

-			166, 166, 166, 166, 166, 166, 166, 166, 

-			166, 166, 166, 162, 162, 162, 160, 166, 

-			162, 166, 166, 166, 166, 166, 166, 166, 

-			166, 166, 166, 166, 166, 166, 166, 166, 

-			166, 166, 166, 166, 166, 166, 166, 166, 

-			166, 166, 166, 162, 160, 162, 160, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-			162, 162, 162, 162, 162, 162, 162, 162, 

-		};

-		YYDEBUG(224, *YYCURSOR);

-		YYFILL(6);

-		yych = *YYCURSOR;

-		YYDEBUG(-1, yych);

-		switch (yych) {

-		case 0x00:	goto yy226;

-		case '\t':

-		case ' ':	goto yy230;

-		case '\n':	goto yy232;

-		case '\r':	goto yy234;

-		case '!':

-		case '&':

-		case '(':

-		case ')':

-		case '^':

-		case '|':

-		case '~':	goto yy235;

-		case '"':	goto yy237;

-		case '$':	goto yy239;

-		case '\'':	goto yy240;

-		case '-':	goto yy241;

-		case '.':	goto yy242;

-		case '0':

-		case '1':

-		case '2':

-		case '3':

-		case '4':

-		case '5':

-		case '6':

-		case '7':

-		case '8':

-		case '9':	goto yy243;

-		case ';':	goto yy245;

-		case '=':	goto yy246;

-		case 'A':

-		case 'B':

-		case 'C':

-		case 'D':

-		case 'E':

-		case 'G':

-		case 'H':

-		case 'I':

-		case 'J':

-		case 'K':

-		case 'L':

-		case 'M':

-		case 'P':

-		case 'Q':

-		case 'R':

-		case 'S':

-		case 'U':

-		case 'V':

-		case 'W':

-		case 'X':

-		case 'Z':

-		case '_':

-		case 'a':

-		case 'b':

-		case 'c':

-		case 'd':

-		case 'e':

-		case 'g':

-		case 'h':

-		case 'i':

-		case 'j':

-		case 'k':

-		case 'l':

-		case 'm':

-		case 'p':

-		case 'q':

-		case 'r':

-		case 's':

-		case 'u':

-		case 'v':

-		case 'w':

-		case 'x':

-		case 'z':	goto yy248;

-		case 'F':

-		case 'f':	goto yy250;

-		case 'N':

-		case 'n':	goto yy251;

-		case 'O':

-		case 'o':	goto yy252;

-		case 'T':

-		case 't':	goto yy253;

-		case 'Y':

-		case 'y':	goto yy254;

-		default:	goto yy228;

-		}

-yy226:

-		YYDEBUG(226, *YYCURSOR);

-		++YYCURSOR;

-yy227:

-		YYDEBUG(227, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 598 "Zend/zend_ini_scanner.l"

-		{ /* End of option value (if EOF is reached before EOL */

-	BEGIN(INITIAL);

-	return END_OF_LINE;

-}

-#line 2921 "Zend/zend_ini_scanner.c"

-yy228:

-		YYDEBUG(228, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy256;

-yy229:

-		YYDEBUG(229, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 517 "Zend/zend_ini_scanner.l"

-		{ /* Get everything else as option/offset value */

-	RETURN_TOKEN(TC_STRING, yytext, yyleng);

-}

-#line 2934 "Zend/zend_ini_scanner.c"

-yy230:

-		YYDEBUG(230, *YYCURSOR);

-		yyaccept = 1;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy306;

-yy231:

-		YYDEBUG(231, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 571 "Zend/zend_ini_scanner.l"

-		{

-	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);

-}

-#line 2947 "Zend/zend_ini_scanner.c"

-yy232:

-		YYDEBUG(232, *YYCURSOR);

-		++YYCURSOR;

-yy233:

-		YYDEBUG(233, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 489 "Zend/zend_ini_scanner.l"

-		{ /* End of option value */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 2960 "Zend/zend_ini_scanner.c"

-yy234:

-		YYDEBUG(234, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy304;

-		goto yy233;

-yy235:

-		YYDEBUG(235, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy303;

-yy236:

-		YYDEBUG(236, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 507 "Zend/zend_ini_scanner.l"

-		{ /* Boolean operators */

-	return yytext[0];

-}

-#line 2978 "Zend/zend_ini_scanner.c"

-yy237:

-		YYDEBUG(237, *YYCURSOR);

-		++YYCURSOR;

-yy238:

-		YYDEBUG(238, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 525 "Zend/zend_ini_scanner.l"

-		{ /* Double quoted '"' string start */

-	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);

-	return '"';

-}

-#line 2990 "Zend/zend_ini_scanner.c"

-yy239:

-		YYDEBUG(239, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych <= '\\') {

-			if (yych <= 0x00) goto yy227;

-			if (yych <= '[') goto yy255;

-			goto yy262;

-		} else {

-			if (yych == '{') goto yy300;

-			goto yy255;

-		}

-yy240:

-		YYDEBUG(240, *YYCURSOR);

-		yyaccept = 2;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy296;

-		}

-		goto yy227;

-yy241:

-		YYDEBUG(241, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') goto yy256;

-		if (yych <= '9') goto yy294;

-		goto yy256;

-yy242:

-		YYDEBUG(242, *YYCURSOR);

-		yyaccept = 0;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') goto yy256;

-		if (yych <= '9') goto yy292;

-		goto yy256;

-yy243:

-		YYDEBUG(243, *YYCURSOR);

-		yyaccept = 3;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '/') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy244;

-					if (yych <= 0x08) goto yy256;

-				} else {

-					if (yych != '\r') goto yy256;

-				}

-			} else {

-				if (yych <= ')') {

-					if (yych <= '"') goto yy244;

-					if (yych <= '%') goto yy256;

-				} else {

-					if (yych == '.') goto yy288;

-					goto yy256;

-				}

-			}

-		} else {

-			if (yych <= ']') {

-				if (yych <= ';') {

-					if (yych <= '9') goto yy290;

-					if (yych <= ':') goto yy256;

-				} else {

-					if (yych != '=') goto yy256;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '^') goto yy244;

-					if (yych <= '{') goto yy256;

-				} else {

-					if (yych != '~') goto yy256;

-				}

-			}

-		}

-yy244:

-		YYDEBUG(244, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 499 "Zend/zend_ini_scanner.l"

-		{ /* Get number option value as string */

-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);

-}

-#line 3069 "Zend/zend_ini_scanner.c"

-yy245:

-		YYDEBUG(245, *YYCURSOR);

-		yyaccept = 2;

-		yych = *(YYMARKER = ++YYCURSOR);

-		goto yy284;

-yy246:

-		YYDEBUG(246, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(247, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 511 "Zend/zend_ini_scanner.l"

-		{ /* Make = used in option value to trigger error */

-	yyless(0);

-	BEGIN(INITIAL);

-	return END_OF_LINE;

-}

-#line 3086 "Zend/zend_ini_scanner.c"

-yy248:

-		YYDEBUG(248, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 4) {

-			goto yy257;

-		}

-		if (yych <= ':') {

-			if (yych <= '\r') {

-				if (yych <= 0x08) {

-					if (yych >= 0x01) goto yy256;

-				} else {

-					if (yych <= '\n') goto yy249;

-					if (yych <= '\f') goto yy256;

-				}

-			} else {

-				if (yych <= '"') {

-					if (yych <= 0x1F) goto yy256;

-				} else {

-					if (yych <= '%') goto yy256;

-					if (yych >= '*') goto yy256;

-				}

-			}

-		} else {

-			if (yych <= '^') {

-				if (yych <= '<') {

-					if (yych >= '<') goto yy256;

-				} else {

-					if (yych <= '=') goto yy249;

-					if (yych <= ']') goto yy256;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '{') goto yy256;

-				} else {

-					if (yych != '~') goto yy256;

-				}

-			}

-		}

-yy249:

-		YYDEBUG(249, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 495 "Zend/zend_ini_scanner.l"

-		{ /* Get constant option value */

-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);

-}

-#line 3133 "Zend/zend_ini_scanner.c"

-yy250:

-		YYDEBUG(250, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '<') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '/') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					goto yy256;

-				} else {

-					if (yych <= '9') goto yy257;

-					if (yych == ';') goto yy249;

-					goto yy256;

-				}

-			}

-		} else {

-			if (yych <= '_') {

-				if (yych <= 'A') {

-					if (yych <= '=') goto yy249;

-					if (yych <= '@') goto yy256;

-					goto yy280;

-				} else {

-					if (yych <= 'Z') goto yy257;

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					goto yy257;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych <= '`') goto yy256;

-					if (yych <= 'a') goto yy280;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy251:

-		YYDEBUG(251, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= 'N') {

-			if (yych <= '%') {

-				if (yych <= '\f') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					if (yych <= '\n') goto yy249;

-					goto yy256;

-				} else {

-					if (yych <= '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					if (yych <= '"') goto yy249;

-					goto yy256;

-				}

-			} else {

-				if (yych <= ':') {

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					if (yych <= '9') goto yy257;

-					goto yy256;

-				} else {

-					if (yych <= '<') {

-						if (yych <= ';') goto yy249;

-						goto yy256;

-					} else {

-						if (yych <= '=') goto yy249;

-						if (yych <= '@') goto yy256;

-						goto yy257;

-					}

-				}

-			}

-		} else {

-			if (yych <= 'n') {

-				if (yych <= 'Z') {

-					if (yych <= 'O') goto yy276;

-					if (yych == 'U') goto yy277;

-					goto yy257;

-				} else {

-					if (yych <= '^') {

-						if (yych <= ']') goto yy256;

-						goto yy249;

-					} else {

-						if (yych == '`') goto yy256;

-						goto yy257;

-					}

-				}

-			} else {

-				if (yych <= 'z') {

-					if (yych <= 'o') goto yy276;

-					if (yych == 'u') goto yy277;

-					goto yy257;

-				} else {

-					if (yych <= '|') {

-						if (yych <= '{') goto yy256;

-						goto yy249;

-					} else {

-						if (yych == '~') goto yy249;

-						goto yy256;

-					}

-				}

-			}

-		}

-yy252:

-		YYDEBUG(252, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= 'E') {

-			if (yych <= '%') {

-				if (yych <= '\f') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					if (yych <= '\n') goto yy249;

-					goto yy256;

-				} else {

-					if (yych <= '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					if (yych <= '"') goto yy249;

-					goto yy256;

-				}

-			} else {

-				if (yych <= ':') {

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					if (yych <= '9') goto yy257;

-					goto yy256;

-				} else {

-					if (yych <= '<') {

-						if (yych <= ';') goto yy249;

-						goto yy256;

-					} else {

-						if (yych <= '=') goto yy249;

-						if (yych <= '@') goto yy256;

-						goto yy257;

-					}

-				}

-			}

-		} else {

-			if (yych <= 'e') {

-				if (yych <= 'Z') {

-					if (yych <= 'F') goto yy271;

-					if (yych == 'N') goto yy265;

-					goto yy257;

-				} else {

-					if (yych <= '^') {

-						if (yych <= ']') goto yy256;

-						goto yy249;

-					} else {

-						if (yych == '`') goto yy256;

-						goto yy257;

-					}

-				}

-			} else {

-				if (yych <= 'z') {

-					if (yych <= 'f') goto yy271;

-					if (yych == 'n') goto yy265;

-					goto yy257;

-				} else {

-					if (yych <= '|') {

-						if (yych <= '{') goto yy256;

-						goto yy249;

-					} else {

-						if (yych == '~') goto yy249;

-						goto yy256;

-					}

-				}

-			}

-		}

-yy253:

-		YYDEBUG(253, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'R') goto yy269;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'r') goto yy269;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy254:

-		YYDEBUG(254, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'E') goto yy259;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'e') goto yy259;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy255:

-		YYDEBUG(255, *YYCURSOR);

-		yyaccept = 0;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy256:

-		YYDEBUG(256, *YYCURSOR);

-		if (yybm[0+yych] & 2) {

-			goto yy255;

-		}

-		if (yych == '$') goto yy260;

-		goto yy229;

-yy257:

-		YYDEBUG(257, *YYCURSOR);

-		yyaccept = 4;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(258, *YYCURSOR);

-		if (yybm[0+yych] & 4) {

-			goto yy257;

-		}

-		if (yych <= ')') {

-			if (yych <= '\r') {

-				if (yych <= 0x08) {

-					if (yych <= 0x00) goto yy249;

-					goto yy255;

-				} else {

-					if (yych <= '\n') goto yy249;

-					if (yych <= '\f') goto yy255;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= 0x1F) goto yy255;

-					if (yych <= '"') goto yy249;

-					goto yy255;

-				} else {

-					if (yych <= '$') goto yy260;

-					if (yych <= '%') goto yy255;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= ']') {

-				if (yych <= ';') {

-					if (yych <= ':') goto yy255;

-					goto yy249;

-				} else {

-					if (yych == '=') goto yy249;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '^') goto yy249;

-					if (yych <= '{') goto yy255;

-					goto yy249;

-				} else {

-					if (yych == '~') goto yy249;

-					goto yy255;

-				}

-			}

-		}

-yy259:

-		YYDEBUG(259, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'S') goto yy265;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 's') goto yy265;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy260:

-		YYDEBUG(260, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yych <= '\\') {

-			if (yych <= 0x00) goto yy261;

-			if (yych <= '[') goto yy255;

-			goto yy262;

-		} else {

-			if (yych != '{') goto yy255;

-		}

-yy261:

-		YYDEBUG(261, *YYCURSOR);

-		YYCURSOR = YYMARKER;

-		if (yyaccept <= 3) {

-			if (yyaccept <= 1) {

-				if (yyaccept <= 0) {

-					goto yy229;

-				} else {

-					goto yy231;

-				}

-			} else {

-				if (yyaccept <= 2) {

-					goto yy227;

-				} else {

-					goto yy244;

-				}

-			}

-		} else {

-			if (yyaccept <= 5) {

-				if (yyaccept <= 4) {

-					goto yy249;

-				} else {

-					goto yy266;

-				}

-			} else {

-				goto yy273;

-			}

-		}

-yy262:

-		YYDEBUG(262, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		if (yybm[0+yych] & 8) {

-			goto yy263;

-		}

-		goto yy255;

-yy263:

-		YYDEBUG(263, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(264, *YYCURSOR);

-		if (yybm[0+yych] & 8) {

-			goto yy263;

-		}

-		if (yych <= 0x00) goto yy229;

-		if (yych == '\\') goto yy262;

-		goto yy255;

-yy265:

-		YYDEBUG(265, *YYCURSOR);

-		yyaccept = 5;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 16) {

-			goto yy267;

-		}

-		if (yych <= ';') {

-			if (yych <= ' ') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy266;

-					if (yych <= '\t') goto yy256;

-				} else {

-					if (yych != '\r') goto yy256;

-				}

-			} else {

-				if (yych <= ')') {

-					if (yych <= '"') goto yy266;

-					if (yych <= '%') goto yy256;

-				} else {

-					if (yych <= '/') goto yy256;

-					if (yych <= '9') goto yy257;

-					if (yych <= ':') goto yy256;

-				}

-			}

-		} else {

-			if (yych <= '_') {

-				if (yych <= '@') {

-					if (yych != '=') goto yy256;

-				} else {

-					if (yych <= 'Z') goto yy257;

-					if (yych <= ']') goto yy256;

-					if (yych >= '_') goto yy257;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych <= '`') goto yy256;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych >= 0x7F) goto yy256;

-				}

-			}

-		}

-yy266:

-		YYDEBUG(266, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 421 "Zend/zend_ini_scanner.l"

-		{ /* TRUE value (when used outside option value/offset this causes parse error!) */

-	RETURN_TOKEN(BOOL_TRUE, "1", 1);

-}

-#line 3645 "Zend/zend_ini_scanner.c"

-yy267:

-		YYDEBUG(267, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(268, *YYCURSOR);

-		if (yybm[0+yych] & 16) {

-			goto yy267;

-		}

-		goto yy266;

-yy269:

-		YYDEBUG(269, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych != 'U') goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'u') goto yy270;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy270:

-		YYDEBUG(270, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'E') goto yy265;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'e') goto yy265;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy271:

-		YYDEBUG(271, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych != 'F') goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'f') goto yy272;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy272:

-		YYDEBUG(272, *YYCURSOR);

-		yyaccept = 6;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yybm[0+yych] & 4) {

-			goto yy257;

-		}

-		if (yych <= ')') {

-			if (yych <= '\f') {

-				if (yych <= 0x08) {

-					if (yych >= 0x01) goto yy256;

-				} else {

-					if (yych <= '\t') goto yy274;

-					if (yych >= '\v') goto yy256;

-				}

-			} else {

-				if (yych <= ' ') {

-					if (yych <= '\r') goto yy273;

-					if (yych <= 0x1F) goto yy256;

-					goto yy274;

-				} else {

-					if (yych <= '"') goto yy273;

-					if (yych <= '%') goto yy256;

-				}

-			}

-		} else {

-			if (yych <= ']') {

-				if (yych <= ';') {

-					if (yych <= ':') goto yy256;

-				} else {

-					if (yych != '=') goto yy256;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '^') goto yy273;

-					if (yych <= '{') goto yy256;

-				} else {

-					if (yych != '~') goto yy256;

-				}

-			}

-		}

-yy273:

-		YYDEBUG(273, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 425 "Zend/zend_ini_scanner.l"

-		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/

-	RETURN_TOKEN(BOOL_FALSE, "", 0);

-}

-#line 3855 "Zend/zend_ini_scanner.c"

-yy274:

-		YYDEBUG(274, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(275, *YYCURSOR);

-		if (yych == '\t') goto yy274;

-		if (yych == ' ') goto yy274;

-		goto yy273;

-yy276:

-		YYDEBUG(276, *YYCURSOR);

-		yyaccept = 6;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '<') {

-			if (yych <= ' ') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy273;

-					if (yych <= 0x08) goto yy256;

-					if (yych <= '\t') goto yy274;

-					goto yy273;

-				} else {

-					if (yych == '\r') goto yy273;

-					if (yych <= 0x1F) goto yy256;

-					goto yy274;

-				}

-			} else {

-				if (yych <= '/') {

-					if (yych <= '"') goto yy273;

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy273;

-					goto yy256;

-				} else {

-					if (yych <= '9') goto yy257;

-					if (yych == ';') goto yy273;

-					goto yy256;

-				}

-			}

-		} else {

-			if (yych <= '_') {

-				if (yych <= 'N') {

-					if (yych <= '=') goto yy273;

-					if (yych <= '@') goto yy256;

-					if (yych <= 'M') goto yy257;

-					goto yy279;

-				} else {

-					if (yych <= 'Z') goto yy257;

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy273;

-					goto yy257;

-				}

-			} else {

-				if (yych <= 'z') {

-					if (yych <= '`') goto yy256;

-					if (yych == 'n') goto yy279;

-					goto yy257;

-				} else {

-					if (yych <= '|') {

-						if (yych <= '{') goto yy256;

-						goto yy273;

-					} else {

-						if (yych == '~') goto yy273;

-						goto yy256;

-					}

-				}

-			}

-		}

-yy277:

-		YYDEBUG(277, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych != 'L') goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'l') goto yy278;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy278:

-		YYDEBUG(278, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'L') goto yy272;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'l') goto yy272;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy279:

-		YYDEBUG(279, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'E') goto yy272;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'e') goto yy272;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy280:

-		YYDEBUG(280, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych != 'L') goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'l') goto yy281;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy281:

-		YYDEBUG(281, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych != 'S') goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 's') goto yy282;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy282:

-		YYDEBUG(282, *YYCURSOR);

-		yyaccept = 4;

-		yych = *(YYMARKER = ++YYCURSOR);

-		if (yych <= '=') {

-			if (yych <= '"') {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy249;

-					if (yych <= 0x08) goto yy256;

-					goto yy249;

-				} else {

-					if (yych == '\r') goto yy249;

-					if (yych <= 0x1F) goto yy256;

-					goto yy249;

-				}

-			} else {

-				if (yych <= '9') {

-					if (yych <= '%') goto yy256;

-					if (yych <= ')') goto yy249;

-					if (yych <= '/') goto yy256;

-					goto yy257;

-				} else {

-					if (yych == ';') goto yy249;

-					if (yych <= '<') goto yy256;

-					goto yy249;

-				}

-			}

-		} else {

-			if (yych <= '`') {

-				if (yych <= 'Z') {

-					if (yych <= '@') goto yy256;

-					if (yych == 'E') goto yy272;

-					goto yy257;

-				} else {

-					if (yych <= ']') goto yy256;

-					if (yych <= '^') goto yy249;

-					if (yych <= '_') goto yy257;

-					goto yy256;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == 'e') goto yy272;

-					if (yych <= 'z') goto yy257;

-					goto yy256;

-				} else {

-					if (yych == '}') goto yy256;

-					if (yych <= '~') goto yy249;

-					goto yy256;

-				}

-			}

-		}

-yy283:

-		YYDEBUG(283, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy284:

-		YYDEBUG(284, *YYCURSOR);

-		if (yybm[0+yych] & 32) {

-			goto yy283;

-		}

-		if (yych >= '\r') goto yy287;

-yy285:

-		YYDEBUG(285, *YYCURSOR);

-		++YYCURSOR;

-yy286:

-		YYDEBUG(286, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 585 "Zend/zend_ini_scanner.l"

-		{ /* Comment */

-	BEGIN(INITIAL);

-	SCNG(lineno)++;

-	return END_OF_LINE;

-}

-#line 4248 "Zend/zend_ini_scanner.c"

-yy287:

-		YYDEBUG(287, *YYCURSOR);

-		yych = *++YYCURSOR;

-		if (yych == '\n') goto yy285;

-		goto yy286;

-yy288:

-		YYDEBUG(288, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(289, *YYCURSOR);

-		if (yybm[0+yych] & 64) {

-			goto yy288;

-		}

-		if (yych <= ')') {

-			if (yych <= '\r') {

-				if (yych <= 0x08) {

-					if (yych <= 0x00) goto yy244;

-					goto yy255;

-				} else {

-					if (yych <= '\n') goto yy244;

-					if (yych <= '\f') goto yy255;

-					goto yy244;

-				}

-			} else {

-				if (yych <= '#') {

-					if (yych <= 0x1F) goto yy255;

-					if (yych <= '"') goto yy244;

-					goto yy255;

-				} else {

-					if (yych <= '$') goto yy260;

-					if (yych <= '%') goto yy255;

-					goto yy244;

-				}

-			}

-		} else {

-			if (yych <= ']') {

-				if (yych <= ';') {

-					if (yych <= ':') goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '=') goto yy244;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '^') goto yy244;

-					if (yych <= '{') goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '~') goto yy244;

-					goto yy255;

-				}

-			}

-		}

-yy290:

-		YYDEBUG(290, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(291, *YYCURSOR);

-		if (yych <= '.') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy244;

-					if (yych <= 0x08) goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '\r') goto yy244;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych <= '"') goto yy244;

-					if (yych <= '#') goto yy255;

-					goto yy260;

-				} else {

-					if (yych <= '%') goto yy255;

-					if (yych <= ')') goto yy244;

-					if (yych <= '-') goto yy255;

-					goto yy288;

-				}

-			}

-		} else {

-			if (yych <= '=') {

-				if (yych <= ':') {

-					if (yych <= '/') goto yy255;

-					if (yych <= '9') goto yy290;

-					goto yy255;

-				} else {

-					if (yych == '<') goto yy255;

-					goto yy244;

-				}

-			} else {

-				if (yych <= '{') {

-					if (yych == '^') goto yy244;

-					goto yy255;

-				} else {

-					if (yych == '}') goto yy255;

-					if (yych <= '~') goto yy244;

-					goto yy255;

-				}

-			}

-		}

-yy292:

-		YYDEBUG(292, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(293, *YYCURSOR);

-		if (yych <= '/') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy244;

-					if (yych <= 0x08) goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '\r') goto yy244;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych <= '"') goto yy244;

-					if (yych <= '#') goto yy255;

-					goto yy260;

-				} else {

-					if (yych <= '%') goto yy255;

-					if (yych <= ')') goto yy244;

-					goto yy255;

-				}

-			}

-		} else {

-			if (yych <= ']') {

-				if (yych <= ';') {

-					if (yych <= '9') goto yy292;

-					if (yych <= ':') goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '=') goto yy244;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '^') goto yy244;

-					if (yych <= '{') goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '~') goto yy244;

-					goto yy255;

-				}

-			}

-		}

-yy294:

-		YYDEBUG(294, *YYCURSOR);

-		yyaccept = 3;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(295, *YYCURSOR);

-		if (yych <= '/') {

-			if (yych <= 0x1F) {

-				if (yych <= '\n') {

-					if (yych <= 0x00) goto yy244;

-					if (yych <= 0x08) goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '\r') goto yy244;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '$') {

-					if (yych <= '"') goto yy244;

-					if (yych <= '#') goto yy255;

-					goto yy260;

-				} else {

-					if (yych <= '%') goto yy255;

-					if (yych <= ')') goto yy244;

-					goto yy255;

-				}

-			}

-		} else {

-			if (yych <= ']') {

-				if (yych <= ';') {

-					if (yych <= '9') goto yy294;

-					if (yych <= ':') goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '=') goto yy244;

-					goto yy255;

-				}

-			} else {

-				if (yych <= '|') {

-					if (yych <= '^') goto yy244;

-					if (yych <= '{') goto yy255;

-					goto yy244;

-				} else {

-					if (yych == '~') goto yy244;

-					goto yy255;

-				}

-			}

-		}

-yy296:

-		YYDEBUG(296, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-		YYDEBUG(297, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy296;

-		}

-		YYDEBUG(298, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(299, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 368 "Zend/zend_ini_scanner.l"

-		{ /* Raw string */

-	/* Eat leading and trailing single quotes */

-	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {

-		SCNG(yy_text)++;

-		yyleng = yyleng - 2;

-	}

-	RETURN_TOKEN(TC_RAW, yytext, yyleng);

-}

-#line 4475 "Zend/zend_ini_scanner.c"

-yy300:

-		YYDEBUG(300, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(301, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 401 "Zend/zend_ini_scanner.l"

-		{ /* Variable start */

-	yy_push_state(ST_VARNAME TSRMLS_CC);

-	return TC_DOLLAR_CURLY;

-}

-#line 4486 "Zend/zend_ini_scanner.c"

-yy302:

-		YYDEBUG(302, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy303:

-		YYDEBUG(303, *YYCURSOR);

-		if (yych == '\t') goto yy302;

-		if (yych == ' ') goto yy302;

-		goto yy236;

-yy304:

-		YYDEBUG(304, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy233;

-yy305:

-		YYDEBUG(305, *YYCURSOR);

-		yyaccept = 1;

-		YYMARKER = ++YYCURSOR;

-		YYFILL(2);

-		yych = *YYCURSOR;

-yy306:

-		YYDEBUG(306, *YYCURSOR);

-		if (yych <= 0x1F) {

-			if (yych <= '\n') {

-				if (yych <= 0x08) goto yy231;

-				if (yych <= '\t') goto yy305;

-				goto yy304;

-			} else {

-				if (yych == '\r') goto yy308;

-				goto yy231;

-			}

-		} else {

-			if (yych <= '"') {

-				if (yych <= ' ') goto yy305;

-				if (yych <= '!') goto yy231;

-			} else {

-				if (yych == ';') goto yy283;

-				goto yy231;

-			}

-		}

-		YYDEBUG(307, *YYCURSOR);

-		yych = *++YYCURSOR;

-		goto yy238;

-yy308:

-		YYDEBUG(308, *YYCURSOR);

-		++YYCURSOR;

-		if ((yych = *YYCURSOR) == '\n') goto yy304;

-		goto yy233;

-	}

-/* *********************************** */

-yyc_ST_VARNAME:

-	{

-		static const unsigned char yybm[] = {

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128,   0,   0, 128, 128,   0, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128,   0,   0, 128,   0, 128,   0, 128, 

-			  0,   0, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128,   0, 128,   0, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128,   0, 128, 128,   0, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128,   0,   0,   0,   0, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-			128, 128, 128, 128, 128, 128, 128, 128, 

-		};

-		YYDEBUG(309, *YYCURSOR);

-		YYFILL(2);

-		yych = *YYCURSOR;

-		if (yych <= ')') {

-			if (yych <= '"') {

-				if (yych <= '\f') {

-					if (yych <= 0x08) goto yy311;

-					if (yych <= '\n') goto yy313;

-				} else {

-					if (yych <= '\r') goto yy313;

-					if (yych >= '!') goto yy313;

-				}

-			} else {

-				if (yych <= '%') {

-					if (yych == '$') goto yy313;

-				} else {

-					if (yych != '\'') goto yy313;

-				}

-			}

-		} else {

-			if (yych <= '[') {

-				if (yych <= '<') {

-					if (yych == ';') goto yy313;

-				} else {

-					if (yych <= '=') goto yy313;

-					if (yych >= '[') goto yy313;

-				}

-			} else {

-				if (yych <= 'z') {

-					if (yych == '^') goto yy313;

-				} else {

-					if (yych == '}') goto yy315;

-					if (yych <= '~') goto yy313;

-				}

-			}

-		}

-yy311:

-		YYDEBUG(311, *YYCURSOR);

-		++YYCURSOR;

-		yych = *YYCURSOR;

-		goto yy318;

-yy312:

-		YYDEBUG(312, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 406 "Zend/zend_ini_scanner.l"

-		{ /* Variable name */

-	/* Eat leading whitespace */

-	EAT_LEADING_WHITESPACE();

-

-	/* Eat trailing whitespace */

-	EAT_TRAILING_WHITESPACE();

-

-	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);

-}

-#line 4627 "Zend/zend_ini_scanner.c"

-yy313:

-		YYDEBUG(313, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(314, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 603 "Zend/zend_ini_scanner.l"

-		{

-	return 0;

-}

-#line 4637 "Zend/zend_ini_scanner.c"

-yy315:

-		YYDEBUG(315, *YYCURSOR);

-		++YYCURSOR;

-		YYDEBUG(316, *YYCURSOR);

-		yyleng = YYCURSOR - SCNG(yy_text);

-#line 416 "Zend/zend_ini_scanner.l"

-		{ /* Variable end */

-	yy_pop_state(TSRMLS_C);

-	return '}';

-}

-#line 4648 "Zend/zend_ini_scanner.c"

-yy317:

-		YYDEBUG(317, *YYCURSOR);

-		++YYCURSOR;

-		YYFILL(1);

-		yych = *YYCURSOR;

-yy318:

-		YYDEBUG(318, *YYCURSOR);

-		if (yybm[0+yych] & 128) {

-			goto yy317;

-		}

-		goto yy312;

-	}

-}

-#line 607 "Zend/zend_ini_scanner.l"

-

-}

+/* Generated by re2c 0.13.6 */
+#line 1 "Zend/zend_ini_scanner.l"
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Zeev Suraski <zeev@zend.com>                                |
+   |          Jani Taskinen <jani@php.net>                                |
+   |          Marcus Boerger <helly@php.net>                              |
+   |          Nuno Lopes <nlopess@php.net>                                |
+   |          Scott MacVicar <scottmac@php.net>                           |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include <errno.h>
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_globals.h"
+#include <zend_ini_parser.h>
+#include "zend_ini_scanner.h"
+
+#if 0
+# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
+#else
+# define YYDEBUG(s, c)
+#endif
+
+#include "zend_ini_scanner_defs.h"
+
+#define YYCTYPE   unsigned char
+/* allow the scanner to read one null byte after the end of the string (from ZEND_MMAP_AHEAD)
+ * so that if will be able to terminate to match the current token (e.g. non-enclosed string) */
+#define YYFILL(n) { if (YYCURSOR > YYLIMIT) return 0; }
+#define YYCURSOR  SCNG(yy_cursor)
+#define YYLIMIT   SCNG(yy_limit)
+#define YYMARKER  SCNG(yy_marker)
+
+#define YYGETCONDITION()  SCNG(yy_state)
+#define YYSETCONDITION(s) SCNG(yy_state) = s
+
+#define STATE(name)  yyc##name
+
+/* emulate flex constructs */
+#define BEGIN(state) YYSETCONDITION(STATE(state))
+#define YYSTATE      YYGETCONDITION()
+#define yytext       ((char*)SCNG(yy_text))
+#define yyleng       SCNG(yy_leng)
+#define yyless(x)    do {	YYCURSOR = (unsigned char*)yytext + x; \
+							yyleng   = (unsigned int)x; } while(0)
+
+/* #define yymore()     goto yymore_restart */
+
+/* perform sanity check. If this message is triggered you should
+   increase the ZEND_MMAP_AHEAD value in the zend_streams.h file */
+#define YYMAXFILL 6
+#if ZEND_MMAP_AHEAD < (YYMAXFILL + 1)
+# error ZEND_MMAP_AHEAD should be greater than YYMAXFILL
+#endif
+
+
+/* How it works (for the core ini directives):
+ * ===========================================
+ *
+ * 1. Scanner scans file for tokens and passes them to parser.
+ * 2. Parser parses the tokens and passes the name/value pairs to the callback
+ *    function which stores them in the configuration hash table.
+ * 3. Later REGISTER_INI_ENTRIES() is called which triggers the actual
+ *    registering of ini entries and uses zend_get_configuration_directive()
+ *    to fetch the previously stored name/value pair from configuration hash table
+ *    and registers the static ini entries which match the name to the value
+ *    into EG(ini_directives) hash table.
+ * 4. PATH section entries are used per-request from down to top, each overriding
+ *    previous if one exists. zend_alter_ini_entry() is called for each entry.
+ *    Settings in PATH section are ZEND_INI_SYSTEM accessible and thus mimics the
+ *    php_admin_* directives used within Apache httpd.conf when PHP is compiled as
+ *    module for Apache.
+ * 5. User defined ini files (like .htaccess for apache) are parsed for each request and
+ *    stored in separate hash defined by SAPI.
+ */
+
+/* TODO: (ordered by importance :-)
+ * ===============================================================================
+ *
+ *  - Separate constant lookup totally from plain strings (using CONSTANT pattern)
+ *  - Add #if .. #else .. #endif and ==, !=, <, > , <=, >= operators
+ *  - Add #include "some.ini"
+ *  - Allow variables to refer to options also when using parse_ini_file()
+ *
+ */
+
+/* Globals Macros */
+#define SCNG	INI_SCNG
+#ifdef ZTS
+ZEND_API ts_rsrc_id ini_scanner_globals_id;
+#else
+ZEND_API zend_ini_scanner_globals ini_scanner_globals;
+#endif
+
+/* Eat leading whitespace */
+#define EAT_LEADING_WHITESPACE()                     \
+	while (yytext[0]) {                              \
+		if (yytext[0] == ' ' || yytext[0] == '\t') { \
+			SCNG(yy_text)++;                         \
+			yyleng--;                                \
+		} else {                                     \
+			break;                                   \
+		}                                            \
+	}
+
+/* Eat trailing whitespace + extra char */
+#define EAT_TRAILING_WHITESPACE_EX(ch)              \
+	while (yyleng > 0 && (                          \
+		(ch != 'X' && yytext[yyleng - 1] ==  ch) || \
+		yytext[yyleng - 1] == '\n' ||               \
+		yytext[yyleng - 1] == '\r' ||               \
+		yytext[yyleng - 1] == '\t' ||               \
+		yytext[yyleng - 1] == ' ')                  \
+	) {                                             \
+		yyleng--;                                   \
+	}
+
+/* Eat trailing whitespace */
+#define EAT_TRAILING_WHITESPACE()	EAT_TRAILING_WHITESPACE_EX('X')
+
+#define zend_ini_copy_value(retval, str, len) {  \
+	Z_STRVAL_P(retval) = zend_strndup(str, len); \
+	Z_STRLEN_P(retval) = len;                    \
+	Z_TYPE_P(retval) = IS_STRING;                \
+}
+
+#define RETURN_TOKEN(type, str, len) {                       \
+	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_TYPED) {      \
+		zend_ini_copy_typed_value(ini_lval, type, str, len); \
+	} else {                                                 \
+		zend_ini_copy_value(ini_lval, str, len);             \
+	}                                                        \
+	return type;                                             \
+}
+
+static inline int convert_to_number(zval *retval, const char *str, const int str_len)
+{
+	zend_uchar type;
+	int overflow;
+	long lval;
+	double dval;
+
+	if ((type = is_numeric_string_ex(str, str_len, &lval, &dval, 0, &overflow)) != 0) {
+		if (type == IS_LONG) {
+			ZVAL_LONG(retval, lval);
+			return SUCCESS;
+		} else if (type == IS_DOUBLE && !overflow) {
+			ZVAL_DOUBLE(retval, dval);
+			return SUCCESS;
+		}
+	}
+
+	return FAILURE;
+}
+
+static void zend_ini_copy_typed_value(zval *retval, const int type, const char *str, int len)
+{
+	switch (type) {
+		case BOOL_FALSE:
+		case BOOL_TRUE:
+			ZVAL_BOOL(retval, type == BOOL_TRUE);
+			break;
+
+		case NULL_NULL:
+			ZVAL_NULL(retval);
+			break;
+
+		case TC_NUMBER:
+			if (convert_to_number(retval, str, len) == SUCCESS) {
+				break;
+			}
+			/* intentional fall-through */
+		default:
+			zend_ini_copy_value(retval, str, len);
+	}
+}
+
+static void _yy_push_state(int new_state TSRMLS_DC)
+{
+	zend_stack_push(&SCNG(state_stack), (void *) &YYGETCONDITION(), sizeof(int));
+	YYSETCONDITION(new_state);
+}
+
+#define yy_push_state(state_and_tsrm) _yy_push_state(yyc##state_and_tsrm)
+
+static void yy_pop_state(TSRMLS_D)
+{
+	int *stack_state;
+	zend_stack_top(&SCNG(state_stack), (void **) &stack_state);
+	YYSETCONDITION(*stack_state);
+	zend_stack_del_top(&SCNG(state_stack));
+}
+
+static void yy_scan_buffer(char *str, unsigned int len TSRMLS_DC)
+{
+	YYCURSOR = (YYCTYPE*)str;
+	SCNG(yy_start) = YYCURSOR;
+	YYLIMIT  = YYCURSOR + len;
+}
+
+#define ini_filename SCNG(filename)
+
+/* {{{ init_ini_scanner()
+*/
+static int init_ini_scanner(int scanner_mode, zend_file_handle *fh TSRMLS_DC)
+{
+	/* Sanity check */
+	if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW && scanner_mode != ZEND_INI_SCANNER_TYPED) {
+		zend_error(E_WARNING, "Invalid scanner mode");
+		return FAILURE;
+	}
+
+	SCNG(lineno) = 1;
+	SCNG(scanner_mode) = scanner_mode;
+	SCNG(yy_in) = fh;
+
+	if (fh != NULL) {
+		ini_filename = zend_strndup(fh->filename, strlen(fh->filename));
+	} else {
+		ini_filename = NULL;
+	}
+
+	zend_stack_init(&SCNG(state_stack));
+	BEGIN(INITIAL);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ shutdown_ini_scanner()
+*/
+void shutdown_ini_scanner(TSRMLS_D)
+{
+	zend_stack_destroy(&SCNG(state_stack));
+	if (ini_filename) {
+		free(ini_filename);
+	}
+}
+/* }}} */
+
+/* {{{ zend_ini_scanner_get_lineno()
+*/
+int zend_ini_scanner_get_lineno(TSRMLS_D)
+{
+	return SCNG(lineno);
+}
+/* }}} */
+
+/* {{{ zend_ini_scanner_get_filename()
+*/
+char *zend_ini_scanner_get_filename(TSRMLS_D)
+{
+	return ini_filename ? ini_filename : "Unknown";
+}
+/* }}} */
+
+/* {{{ zend_ini_open_file_for_scanning()
+*/
+int zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode TSRMLS_DC)
+{
+	char *buf;
+	size_t size;
+
+	if (zend_stream_fixup(fh, &buf, &size TSRMLS_CC) == FAILURE) {
+		return FAILURE;
+	}
+
+	if (init_ini_scanner(scanner_mode, fh TSRMLS_CC) == FAILURE) {
+		zend_file_handle_dtor(fh TSRMLS_CC);
+		return FAILURE;
+	}
+
+	yy_scan_buffer(buf, size TSRMLS_CC);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ zend_ini_prepare_string_for_scanning()
+*/
+int zend_ini_prepare_string_for_scanning(char *str, int scanner_mode TSRMLS_DC)
+{
+	int len = strlen(str);
+
+	if (init_ini_scanner(scanner_mode, NULL TSRMLS_CC) == FAILURE) {
+		return FAILURE;
+	}
+
+	yy_scan_buffer(str, len TSRMLS_CC);
+
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ zend_ini_escape_string()
+ */
+static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_type TSRMLS_DC)
+{
+	register char *s, *t;
+	char *end;
+
+	zend_ini_copy_value(lval, str, len);
+
+	/* convert escape sequences */
+	s = t = Z_STRVAL_P(lval);
+	end = s + Z_STRLEN_P(lval);
+
+	while (s < end) {
+		if (*s == '\\') {
+			s++;
+			if (s >= end) {
+				*t++ = '\\';
+				continue;
+			}
+			switch (*s) {
+				case '"':
+					if (*s != quote_type) {
+						*t++ = '\\';
+						*t++ = *s;
+						break;
+					}
+				case '\\':
+				case '$':
+					*t++ = *s;
+					Z_STRLEN_P(lval)--;
+					break;
+				default:
+					*t++ = '\\';
+					*t++ = *s;
+					break;
+			}
+		} else {
+			*t++ = *s;
+		}
+		if (*s == '\n' || (*s == '\r' && (*(s+1) != '\n'))) {
+			SCNG(lineno)++;
+		}
+		s++;
+	}
+	*t = 0;
+}
+/* }}} */
+
+int ini_lex(zval *ini_lval TSRMLS_DC)
+{
+restart:
+	SCNG(yy_text) = YYCURSOR;
+
+/* yymore_restart: */
+	/* detect EOF */
+	if (YYCURSOR >= YYLIMIT) {
+		if (YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW)) {
+			BEGIN(INITIAL);
+			return END_OF_LINE;
+		}
+		return 0;
+	}
+
+	/* Eat any UTF-8 BOM we find in the first 3 bytes */
+	if (YYCURSOR == SCNG(yy_start) && YYCURSOR + 3 < YYLIMIT) {
+		if (memcmp(YYCURSOR, "\xef\xbb\xbf", 3) == 0) {
+			YYCURSOR += 3;
+			goto restart;
+		}
+	}
+
+#line 384 "Zend/zend_ini_scanner.c"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept = 0;
+	if (YYGETCONDITION() < 4) {
+		if (YYGETCONDITION() < 2) {
+			if (YYGETCONDITION() < 1) {
+				goto yyc_INITIAL;
+			} else {
+				goto yyc_ST_OFFSET;
+			}
+		} else {
+			if (YYGETCONDITION() < 3) {
+				goto yyc_ST_SECTION_VALUE;
+			} else {
+				goto yyc_ST_VALUE;
+			}
+		}
+	} else {
+		if (YYGETCONDITION() < 6) {
+			if (YYGETCONDITION() < 5) {
+				goto yyc_ST_SECTION_RAW;
+			} else {
+				goto yyc_ST_DOUBLE_QUOTES;
+			}
+		} else {
+			if (YYGETCONDITION() < 7) {
+				goto yyc_ST_VARNAME;
+			} else {
+				goto yyc_ST_RAW;
+			}
+		}
+	}
+/* *********************************** */
+yyc_INITIAL:
+	{
+		static const unsigned char yybm[] = {
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 160,   0, 144, 144,   0, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			240, 128, 128, 144, 128, 144, 128, 144, 
+			128, 128, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 144, 128, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 144, 144, 128, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 128, 128, 128, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+		};
+		YYDEBUG(1, *YYCURSOR);
+		YYFILL(5);
+		yych = *YYCURSOR;
+		YYDEBUG(-1, yych);
+		switch (yych) {
+		case '\t':	goto yy5;
+		case '\n':	goto yy7;
+		case '\r':	goto yy9;
+		case ' ':	goto yy10;
+		case '!':
+		case '"':
+		case '$':
+		case '&':
+		case '(':
+		case ')':
+		case '^':
+		case '{':
+		case '|':
+		case '}':
+		case '~':	goto yy11;
+		case '#':	goto yy13;
+		case '%':
+		case '\'':
+		case '*':
+		case '+':
+		case ',':
+		case '-':
+		case '.':
+		case '/':
+		case ':':
+		case '<':
+		case '>':
+		case '?':
+		case '@':
+		case ']':	goto yy14;
+		case ';':	goto yy15;
+		case '=':	goto yy17;
+		case 'F':
+		case 'f':	goto yy19;
+		case 'N':
+		case 'n':	goto yy20;
+		case 'O':
+		case 'o':	goto yy21;
+		case 'T':
+		case 't':	goto yy22;
+		case 'Y':
+		case 'y':	goto yy23;
+		case '[':	goto yy24;
+		default:	goto yy3;
+		}
+yy3:
+		YYDEBUG(3, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy27;
+yy4:
+		YYDEBUG(4, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 480 "Zend/zend_ini_scanner.l"
+		{ /* Get option name */
+	/* Eat leading whitespace */
+	EAT_LEADING_WHITESPACE();
+
+	/* Eat trailing whitespace */
+	EAT_TRAILING_WHITESPACE();
+
+	RETURN_TOKEN(TC_LABEL, yytext, yyleng);
+}
+#line 522 "Zend/zend_ini_scanner.c"
+yy5:
+		YYDEBUG(5, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy74;
+yy6:
+		YYDEBUG(6, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 626 "Zend/zend_ini_scanner.l"
+		{
+	/* eat whitespace */
+	goto restart;
+}
+#line 536 "Zend/zend_ini_scanner.c"
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		++YYCURSOR;
+yy8:
+		YYDEBUG(8, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 631 "Zend/zend_ini_scanner.l"
+		{
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 548 "Zend/zend_ini_scanner.c"
+yy9:
+		YYDEBUG(9, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy77;
+		goto yy8;
+yy10:
+		YYDEBUG(10, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x08) goto yy27;
+				if (yych <= '\t') goto yy73;
+				goto yy77;
+			} else {
+				if (yych == '\r') goto yy78;
+				if (yych <= 0x1F) goto yy27;
+				goto yy75;
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych == '#') goto yy64;
+				goto yy27;
+			} else {
+				if (yych <= ';') goto yy59;
+				if (yych == '=') goto yy57;
+				goto yy27;
+			}
+		}
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(12, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 554 "Zend/zend_ini_scanner.l"
+		{ /* Disallow these chars outside option values */
+	return yytext[0];
+}
+#line 587 "Zend/zend_ini_scanner.c"
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy65;
+yy14:
+		YYDEBUG(14, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy27;
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy60;
+		YYDEBUG(16, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 654 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 608 "Zend/zend_ini_scanner.c"
+yy17:
+		YYDEBUG(17, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy58;
+yy18:
+		YYDEBUG(18, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 490 "Zend/zend_ini_scanner.l"
+		{ /* Start option value */
+	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
+		yy_push_state(ST_RAW TSRMLS_CC);
+	} else {
+		yy_push_state(ST_VALUE TSRMLS_CC);
+	}
+	return '=';
+}
+#line 626 "Zend/zend_ini_scanner.c"
+yy19:
+		YYDEBUG(19, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy54;
+		if (yych == 'a') goto yy54;
+		goto yy27;
+yy20:
+		YYDEBUG(20, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'U') {
+			if (yych == 'O') goto yy45;
+			if (yych <= 'T') goto yy27;
+			goto yy46;
+		} else {
+			if (yych <= 'o') {
+				if (yych <= 'n') goto yy27;
+				goto yy45;
+			} else {
+				if (yych == 'u') goto yy46;
+				goto yy27;
+			}
+		}
+yy21:
+		YYDEBUG(21, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'N') {
+			if (yych == 'F') goto yy39;
+			if (yych <= 'M') goto yy27;
+			goto yy32;
+		} else {
+			if (yych <= 'f') {
+				if (yych <= 'e') goto yy27;
+				goto yy39;
+			} else {
+				if (yych == 'n') goto yy32;
+				goto yy27;
+			}
+		}
+yy22:
+		YYDEBUG(22, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy37;
+		if (yych == 'r') goto yy37;
+		goto yy27;
+yy23:
+		YYDEBUG(23, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy28;
+		if (yych == 'e') goto yy28;
+		goto yy27;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(25, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 405 "Zend/zend_ini_scanner.l"
+		{ /* Section start */
+	/* Enter section data lookup state */
+	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
+		yy_push_state(ST_SECTION_RAW TSRMLS_CC);
+	} else {
+		yy_push_state(ST_SECTION_VALUE TSRMLS_CC);
+	}
+	return TC_SECTION;
+}
+#line 692 "Zend/zend_ini_scanner.c"
+yy26:
+		YYDEBUG(26, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy27:
+		YYDEBUG(27, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy26;
+		}
+		if (yych == '[') goto yy29;
+		goto yy4;
+yy28:
+		YYDEBUG(28, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy32;
+		if (yych == 's') goto yy32;
+		goto yy27;
+yy29:
+		YYDEBUG(29, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(30, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy29;
+		}
+		YYDEBUG(31, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 430 "Zend/zend_ini_scanner.l"
+		{ /* Start of option with offset */
+	/* Eat leading whitespace */
+	EAT_LEADING_WHITESPACE();
+	
+	/* Eat trailing whitespace and [ */
+	EAT_TRAILING_WHITESPACE_EX('[');
+
+	/* Enter offset lookup state */
+	yy_push_state(ST_OFFSET TSRMLS_CC);
+
+	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
+}
+#line 735 "Zend/zend_ini_scanner.c"
+yy32:
+		YYDEBUG(32, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(33, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy32;
+		}
+		if (yych <= '\'') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy26;
+					if (yych <= '\t') goto yy35;
+				} else {
+					if (yych != '\r') goto yy26;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych == '#') goto yy26;
+				} else {
+					if (yych != '&') goto yy26;
+				}
+			}
+		} else {
+			if (yych <= 'Z') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy34;
+					if (yych <= ':') goto yy26;
+				} else {
+					if (yych != '=') goto yy26;
+				}
+			} else {
+				if (yych <= '^') {
+					if (yych <= '[') goto yy29;
+					if (yych <= ']') goto yy26;
+				} else {
+					if (yych <= 'z') goto yy26;
+					if (yych >= 0x7F) goto yy26;
+				}
+			}
+		}
+yy34:
+		YYDEBUG(34, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 468 "Zend/zend_ini_scanner.l"
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+	RETURN_TOKEN(BOOL_TRUE, "1", 1);
+}
+#line 785 "Zend/zend_ini_scanner.c"
+yy35:
+		YYDEBUG(35, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(36, *YYCURSOR);
+		if (yych == '\t') goto yy35;
+		if (yych == ' ') goto yy35;
+		goto yy34;
+yy37:
+		YYDEBUG(37, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'U') goto yy38;
+		if (yych != 'u') goto yy27;
+yy38:
+		YYDEBUG(38, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy32;
+		if (yych == 'e') goto yy32;
+		goto yy27;
+yy39:
+		YYDEBUG(39, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'F') goto yy40;
+		if (yych != 'f') goto yy27;
+yy40:
+		YYDEBUG(40, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(41, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy26;
+					if (yych <= '\t') goto yy43;
+				} else {
+					if (yych != '\r') goto yy26;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy40;
+					if (yych >= '#') goto yy26;
+				} else {
+					if (yych == '%') goto yy26;
+				}
+			}
+		} else {
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy26;
+					if (yych >= '*') goto yy26;
+				} else {
+					if (yych == '<') goto yy26;
+				}
+			} else {
+				if (yych <= ']') {
+					if (yych == '[') goto yy29;
+					goto yy26;
+				} else {
+					if (yych <= '^') goto yy42;
+					if (yych <= 'z') goto yy26;
+					if (yych >= 0x7F) goto yy26;
+				}
+			}
+		}
+yy42:
+		YYDEBUG(42, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 472 "Zend/zend_ini_scanner.l"
+		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
+	RETURN_TOKEN(BOOL_FALSE, "", 0);
+}
+#line 859 "Zend/zend_ini_scanner.c"
+yy43:
+		YYDEBUG(43, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(44, *YYCURSOR);
+		if (yych == '\t') goto yy43;
+		if (yych == ' ') goto yy43;
+		goto yy42;
+yy45:
+		YYDEBUG(45, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\'') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy27;
+					if (yych <= '\t') goto yy43;
+					goto yy42;
+				} else {
+					if (yych == '\r') goto yy42;
+					goto yy27;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy40;
+					if (yych <= '"') goto yy42;
+					goto yy27;
+				} else {
+					if (yych == '%') goto yy27;
+					if (yych <= '&') goto yy42;
+					goto yy27;
+				}
+			}
+		} else {
+			if (yych <= 'N') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy42;
+					if (yych <= ':') goto yy27;
+					goto yy42;
+				} else {
+					if (yych == '=') goto yy42;
+					if (yych <= 'M') goto yy27;
+					goto yy53;
+				}
+			} else {
+				if (yych <= 'm') {
+					if (yych == '^') goto yy42;
+					goto yy27;
+				} else {
+					if (yych <= 'n') goto yy53;
+					if (yych <= 'z') goto yy27;
+					if (yych <= '~') goto yy42;
+					goto yy27;
+				}
+			}
+		}
+yy46:
+		YYDEBUG(46, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy47;
+		if (yych != 'l') goto yy27;
+yy47:
+		YYDEBUG(47, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy48;
+		if (yych != 'l') goto yy27;
+yy48:
+		YYDEBUG(48, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(49, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy26;
+					if (yych <= '\t') goto yy51;
+				} else {
+					if (yych != '\r') goto yy26;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy48;
+					if (yych >= '#') goto yy26;
+				} else {
+					if (yych == '%') goto yy26;
+				}
+			}
+		} else {
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy26;
+					if (yych >= '*') goto yy26;
+				} else {
+					if (yych == '<') goto yy26;
+				}
+			} else {
+				if (yych <= ']') {
+					if (yych == '[') goto yy29;
+					goto yy26;
+				} else {
+					if (yych <= '^') goto yy50;
+					if (yych <= 'z') goto yy26;
+					if (yych >= 0x7F) goto yy26;
+				}
+			}
+		}
+yy50:
+		YYDEBUG(50, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 476 "Zend/zend_ini_scanner.l"
+		{
+	RETURN_TOKEN(NULL_NULL, "", 0);
+}
+#line 974 "Zend/zend_ini_scanner.c"
+yy51:
+		YYDEBUG(51, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(52, *YYCURSOR);
+		if (yych == '\t') goto yy51;
+		if (yych == ' ') goto yy51;
+		goto yy50;
+yy53:
+		YYDEBUG(53, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy40;
+		if (yych == 'e') goto yy40;
+		goto yy27;
+yy54:
+		YYDEBUG(54, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy55;
+		if (yych != 'l') goto yy27;
+yy55:
+		YYDEBUG(55, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy56;
+		if (yych != 's') goto yy27;
+yy56:
+		YYDEBUG(56, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy40;
+		if (yych == 'e') goto yy40;
+		goto yy27;
+yy57:
+		YYDEBUG(57, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy58:
+		YYDEBUG(58, *YYCURSOR);
+		if (yych == '\t') goto yy57;
+		if (yych == ' ') goto yy57;
+		goto yy18;
+yy59:
+		YYDEBUG(59, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy60:
+		YYDEBUG(60, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy59;
+		}
+		if (yych >= '\r') goto yy63;
+yy61:
+		YYDEBUG(61, *YYCURSOR);
+		++YYCURSOR;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 636 "Zend/zend_ini_scanner.l"
+		{ /* Comment */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 1039 "Zend/zend_ini_scanner.c"
+yy63:
+		YYDEBUG(63, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy61;
+		goto yy62;
+yy64:
+		YYDEBUG(64, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy65:
+		YYDEBUG(65, *YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy64;
+					if (yych >= '\n') goto yy70;
+				} else {
+					if (yych == '\r') goto yy72;
+					goto yy64;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych == '#') goto yy64;
+				} else {
+					if (yych != '&') goto yy64;
+				}
+			}
+		} else {
+			if (yych <= 'Z') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy66;
+					if (yych <= ':') goto yy64;
+				} else {
+					if (yych != '=') goto yy64;
+				}
+			} else {
+				if (yych <= '^') {
+					if (yych <= '[') goto yy68;
+					if (yych <= ']') goto yy64;
+				} else {
+					if (yych <= 'z') goto yy64;
+					if (yych >= 0x7F) goto yy64;
+				}
+			}
+		}
+yy66:
+		YYDEBUG(66, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(67, *YYCURSOR);
+		if (yych == '\n') goto yy70;
+		if (yych == '\r') goto yy72;
+		goto yy66;
+yy68:
+		YYDEBUG(68, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(69, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy66;
+			if (yych <= '\t') goto yy68;
+			if (yych >= '\v') goto yy66;
+		} else {
+			if (yych <= '\r') goto yy72;
+			if (yych == ' ') goto yy68;
+			goto yy66;
+		}
+yy70:
+		YYDEBUG(70, *YYCURSOR);
+		++YYCURSOR;
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 642 "Zend/zend_ini_scanner.l"
+		{ /* #Comment */
+	zend_error(E_DEPRECATED, "Comments starting with '#' are deprecated in %s on line %d", zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 1125 "Zend/zend_ini_scanner.c"
+yy72:
+		YYDEBUG(72, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy70;
+		goto yy71;
+yy73:
+		YYDEBUG(73, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy74:
+		YYDEBUG(74, *YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x08) goto yy6;
+				if (yych <= '\t') goto yy73;
+				goto yy77;
+			} else {
+				if (yych == '\r') goto yy78;
+				if (yych <= 0x1F) goto yy6;
+				goto yy73;
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych == '#') goto yy66;
+				goto yy6;
+			} else {
+				if (yych <= ';') goto yy59;
+				if (yych == '=') goto yy57;
+				goto yy6;
+			}
+		}
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(76, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy26;
+					if (yych <= '\t') goto yy73;
+				} else {
+					if (yych == '\r') goto yy78;
+					goto yy26;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy75;
+					if (yych <= '"') goto yy4;
+					goto yy64;
+				} else {
+					if (yych == '%') goto yy26;
+					goto yy4;
+				}
+			}
+		} else {
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy26;
+					if (yych <= ')') goto yy4;
+					goto yy26;
+				} else {
+					if (yych <= ';') goto yy59;
+					if (yych <= '<') goto yy26;
+					goto yy57;
+				}
+			} else {
+				if (yych <= ']') {
+					if (yych == '[') goto yy29;
+					goto yy26;
+				} else {
+					if (yych <= '^') goto yy4;
+					if (yych <= 'z') goto yy26;
+					if (yych <= '~') goto yy4;
+					goto yy26;
+				}
+			}
+		}
+yy77:
+		YYDEBUG(77, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy8;
+yy78:
+		YYDEBUG(78, *YYCURSOR);
+		++YYCURSOR;
+		if ((yych = *YYCURSOR) == '\n') goto yy77;
+		goto yy8;
+	}
+/* *********************************** */
+yyc_ST_DOUBLE_QUOTES:
+	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0, 128,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(79, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy83;
+		if (yych == '$') goto yy85;
+		YYDEBUG(81, *YYCURSOR);
+		++YYCURSOR;
+yy82:
+		YYDEBUG(82, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 586 "Zend/zend_ini_scanner.l"
+		{ /* Escape double quoted string contents */
+	if (YYCURSOR > YYLIMIT) {
+		return 0;
+	}
+	
+	while (YYCURSOR < YYLIMIT) {
+		switch (*YYCURSOR++) {
+			case '"':
+				if (YYCURSOR < YYLIMIT && YYCURSOR[-2] == '\\' && *YYCURSOR != '\r' && *YYCURSOR != '\n') {
+					continue;
+				}
+				break;
+			case '$':
+				if (*YYCURSOR == '{') {
+					break;
+				}
+				continue;
+			case '\\':
+				if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {
+					YYCURSOR++;
+				}
+				/* fall through */
+			default:
+				continue;
+		}
+		
+		YYCURSOR--;
+		break;
+	}
+
+	yyleng = YYCURSOR - SCNG(yy_text);
+	
+	zend_ini_escape_string(ini_lval, yytext, yyleng, '"' TSRMLS_CC);
+	return TC_QUOTED_STRING;
+}
+#line 1301 "Zend/zend_ini_scanner.c"
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy89;
+yy84:
+		YYDEBUG(84, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 581 "Zend/zend_ini_scanner.l"
+		{ /* Double quoted '"' string ends */
+	yy_pop_state(TSRMLS_C);
+	return '"';
+}
+#line 1315 "Zend/zend_ini_scanner.c"
+yy85:
+		YYDEBUG(85, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '{') goto yy82;
+		YYDEBUG(86, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(87, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 448 "Zend/zend_ini_scanner.l"
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME TSRMLS_CC);
+	return TC_DOLLAR_CURLY;
+}
+#line 1329 "Zend/zend_ini_scanner.c"
+yy88:
+		YYDEBUG(88, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy88;
+		}
+		goto yy84;
+	}
+/* *********************************** */
+yyc_ST_OFFSET:
+	{
+		static const unsigned char yybm[] = {
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66, 194,  64,  66,  66,  64,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			194,  66,  64,  66,  68,  66,  66,   0, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114,  66,  64,  66,  66,  66,  66, 
+			 66,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  66,  72,  64,  66,  82, 
+			 66,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+			 66,  66,  66,  66,  66,  66,  66,  66, 
+		};
+		YYDEBUG(90, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '-') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy92;
+					if (yych <= '\t') goto yy94;
+					goto yy95;
+				} else {
+					if (yych == '\r') goto yy95;
+					if (yych >= ' ') goto yy94;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych == '"') goto yy97;
+					if (yych >= '$') goto yy99;
+				} else {
+					if (yych == '\'') goto yy100;
+					if (yych >= '-') goto yy101;
+				}
+			}
+		} else {
+			if (yych <= 'Z') {
+				if (yych <= '9') {
+					if (yych <= '.') goto yy102;
+					if (yych >= '0') goto yy103;
+				} else {
+					if (yych == ';') goto yy95;
+					if (yych >= 'A') goto yy105;
+				}
+			} else {
+				if (yych <= '^') {
+					if (yych <= '[') goto yy92;
+					if (yych <= '\\') goto yy107;
+					if (yych <= ']') goto yy108;
+				} else {
+					if (yych == '`') goto yy92;
+					if (yych <= 'z') goto yy105;
+				}
+			}
+		}
+yy92:
+		YYDEBUG(92, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy111;
+yy93:
+		YYDEBUG(93, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 572 "Zend/zend_ini_scanner.l"
+		{ /* Get rest as section/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+#line 1433 "Zend/zend_ini_scanner.c"
+yy94:
+		YYDEBUG(94, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy137;
+		}
+		if (yych == '"') goto yy139;
+		if (yych == ']') goto yy140;
+		goto yy111;
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		++YYCURSOR;
+yy96:
+		YYDEBUG(96, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 654 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 1454 "Zend/zend_ini_scanner.c"
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		++YYCURSOR;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 576 "Zend/zend_ini_scanner.l"
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
+	return '"';
+}
+#line 1466 "Zend/zend_ini_scanner.c"
+yy99:
+		YYDEBUG(99, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy96;
+			if (yych <= '[') goto yy110;
+			goto yy115;
+		} else {
+			if (yych == '{') goto yy135;
+			goto yy110;
+		}
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy131;
+		}
+		goto yy96;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy111;
+		if (yych <= '9') goto yy129;
+		goto yy111;
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy111;
+		if (yych <= '9') goto yy127;
+		goto yy111;
+yy103:
+		YYDEBUG(103, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy104;
+				if (yych <= '\f') goto yy111;
+			} else {
+				if (yych == '"') goto yy104;
+				if (yych <= '&') goto yy111;
+			}
+		} else {
+			if (yych <= '9') {
+				if (yych == '.') goto yy123;
+				if (yych <= '/') goto yy111;
+				goto yy125;
+			} else {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy111;
+				} else {
+					if (yych != ']') goto yy111;
+				}
+			}
+		}
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 550 "Zend/zend_ini_scanner.l"
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+#line 1532 "Zend/zend_ini_scanner.c"
+yy105:
+		YYDEBUG(105, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy121;
+		}
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych != '\n') goto yy111;
+			} else {
+				if (yych <= '\r') goto yy106;
+				if (yych <= '!') goto yy111;
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych != '\'') goto yy111;
+			} else {
+				if (yych <= ';') goto yy106;
+				if (yych != ']') goto yy111;
+			}
+		}
+yy106:
+		YYDEBUG(106, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 546 "Zend/zend_ini_scanner.l"
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+#line 1562 "Zend/zend_ini_scanner.c"
+yy107:
+		YYDEBUG(107, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy110;
+yy108:
+		YYDEBUG(108, *YYCURSOR);
+		++YYCURSOR;
+yy109:
+		YYDEBUG(109, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 443 "Zend/zend_ini_scanner.l"
+		{ /* End of section or an option offset */
+	BEGIN(INITIAL);
+	return ']';
+}
+#line 1578 "Zend/zend_ini_scanner.c"
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy111:
+		YYDEBUG(111, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy110;
+		}
+		if (yych == '$') goto yy113;
+		if (yych != '\\') goto yy93;
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		goto yy110;
+yy113:
+		YYDEBUG(113, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy114;
+			if (yych <= '[') goto yy110;
+			goto yy115;
+		} else {
+			if (yych != '{') goto yy110;
+		}
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 1) {
+			if (yyaccept == 0) {
+				goto yy93;
+			} else {
+				goto yy96;
+			}
+		} else {
+			if (yyaccept == 2) {
+				goto yy104;
+			} else {
+				goto yy106;
+			}
+		}
+yy115:
+		YYDEBUG(115, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 4) {
+			goto yy116;
+		}
+		if (yych == '\\') goto yy118;
+		goto yy110;
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(117, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy116;
+		}
+		if (yych == '\\') goto yy120;
+		goto yy110;
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(119, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy116;
+		}
+		if (yych == '\\') goto yy118;
+		goto yy110;
+yy120:
+		YYDEBUG(120, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 4) {
+			goto yy116;
+		}
+		if (yych == '\\') goto yy118;
+		goto yy110;
+yy121:
+		YYDEBUG(121, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(122, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy121;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy106;
+				if (yych <= '\f') goto yy110;
+				goto yy106;
+			} else {
+				if (yych == '"') goto yy106;
+				if (yych <= '#') goto yy110;
+				goto yy113;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy106;
+				if (yych <= ':') goto yy110;
+				goto yy106;
+			} else {
+				if (yych <= '[') goto yy110;
+				if (yych <= '\\') goto yy112;
+				if (yych <= ']') goto yy106;
+				goto yy110;
+			}
+		}
+yy123:
+		YYDEBUG(123, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(124, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy123;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy104;
+				if (yych <= '\f') goto yy110;
+				goto yy104;
+			} else {
+				if (yych == '"') goto yy104;
+				if (yych <= '#') goto yy110;
+				goto yy113;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy104;
+				if (yych <= ':') goto yy110;
+				goto yy104;
+			} else {
+				if (yych <= '[') goto yy110;
+				if (yych <= '\\') goto yy112;
+				if (yych <= ']') goto yy104;
+				goto yy110;
+			}
+		}
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(126, *YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= '!') {
+				if (yych <= '\n') {
+					if (yych <= '\t') goto yy110;
+					goto yy104;
+				} else {
+					if (yych == '\r') goto yy104;
+					goto yy110;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= '"') goto yy104;
+					goto yy110;
+				} else {
+					if (yych <= '$') goto yy113;
+					if (yych <= '&') goto yy110;
+					goto yy104;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '.') {
+					if (yych <= '-') goto yy110;
+					goto yy123;
+				} else {
+					if (yych <= '/') goto yy110;
+					if (yych <= '9') goto yy125;
+					goto yy110;
+				}
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy104;
+					goto yy110;
+				} else {
+					if (yych <= '\\') goto yy112;
+					if (yych <= ']') goto yy104;
+					goto yy110;
+				}
+			}
+		}
+yy127:
+		YYDEBUG(127, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(128, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy104;
+				if (yych <= '\f') goto yy110;
+				goto yy104;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy110;
+					goto yy104;
+				} else {
+					if (yych == '$') goto yy113;
+					goto yy110;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy104;
+				if (yych <= '/') goto yy110;
+				if (yych <= '9') goto yy127;
+				goto yy110;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy104;
+					goto yy110;
+				} else {
+					if (yych <= '\\') goto yy112;
+					if (yych <= ']') goto yy104;
+					goto yy110;
+				}
+			}
+		}
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(130, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy104;
+				if (yych <= '\f') goto yy110;
+				goto yy104;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy110;
+					goto yy104;
+				} else {
+					if (yych == '$') goto yy113;
+					goto yy110;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy104;
+				if (yych <= '/') goto yy110;
+				if (yych <= '9') goto yy129;
+				goto yy110;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy104;
+					goto yy110;
+				} else {
+					if (yych <= '\\') goto yy112;
+					if (yych <= ']') goto yy104;
+					goto yy110;
+				}
+			}
+		}
+yy131:
+		YYDEBUG(131, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(132, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy131;
+		}
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(134, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 415 "Zend/zend_ini_scanner.l"
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 1877 "Zend/zend_ini_scanner.c"
+yy135:
+		YYDEBUG(135, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(136, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 448 "Zend/zend_ini_scanner.l"
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME TSRMLS_CC);
+	return TC_DOLLAR_CURLY;
+}
+#line 1888 "Zend/zend_ini_scanner.c"
+yy137:
+		YYDEBUG(137, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(138, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy137;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy93;
+				if (yych <= '\f') goto yy110;
+				goto yy93;
+			} else {
+				if (yych == '"') goto yy139;
+				if (yych <= '#') goto yy110;
+				goto yy113;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy93;
+				if (yych <= ':') goto yy110;
+				goto yy93;
+			} else {
+				if (yych <= '[') goto yy110;
+				if (yych <= '\\') goto yy112;
+				if (yych <= ']') goto yy140;
+				goto yy110;
+			}
+		}
+yy139:
+		YYDEBUG(139, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy98;
+yy140:
+		YYDEBUG(140, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy109;
+	}
+/* *********************************** */
+yyc_ST_RAW:
+	{
+		static const unsigned char yybm[] = {
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 192,   0,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			192,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(141, *YYCURSOR);
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) {
+				if (yych >= 0x01) goto yy145;
+			} else {
+				if (yych <= '\t') goto yy147;
+				if (yych <= '\n') goto yy148;
+				goto yy145;
+			}
+		} else {
+			if (yych <= ' ') {
+				if (yych <= '\r') goto yy150;
+				if (yych <= 0x1F) goto yy145;
+				goto yy147;
+			} else {
+				if (yych == ';') goto yy151;
+				goto yy145;
+			}
+		}
+		YYDEBUG(143, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(144, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 649 "Zend/zend_ini_scanner.l"
+		{ /* End of option value (if EOF is reached before EOL */
+	BEGIN(INITIAL);
+	return END_OF_LINE;
+}
+#line 1998 "Zend/zend_ini_scanner.c"
+yy145:
+		YYDEBUG(145, *YYCURSOR);
+		++YYCURSOR;
+yy146:
+		YYDEBUG(146, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 499 "Zend/zend_ini_scanner.l"
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+	char *sc = NULL;
+	while (YYCURSOR < YYLIMIT) {
+		switch (*YYCURSOR) {
+			case '\n':
+			case '\r':
+				goto end_raw_value_chars;
+				break;
+			case ';':
+				if (sc == NULL) {
+					sc = YYCURSOR;
+				}
+				/* no break */
+			default:
+				YYCURSOR++;
+				break;
+		}
+	}
+end_raw_value_chars:
+	yyleng = YYCURSOR - SCNG(yy_text);
+
+	/* Eat trailing semicolons */
+	while (yytext[yyleng - 1] == ';') {
+		yyleng--;
+	}
+
+	/* Eat leading and trailing double quotes */
+	if (yytext[0] == '"' && yytext[yyleng - 1] == '"') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	} else if (sc) {
+		YYCURSOR = sc;
+		yyleng = YYCURSOR - SCNG(yy_text);
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 2042 "Zend/zend_ini_scanner.c"
+yy147:
+		YYDEBUG(147, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy146;
+			if (yych <= '\n') goto yy159;
+			if (yych <= '\f') goto yy146;
+			goto yy159;
+		} else {
+			if (yych <= ' ') {
+				if (yych <= 0x1F) goto yy146;
+				goto yy159;
+			} else {
+				if (yych == ';') goto yy159;
+				goto yy146;
+			}
+		}
+yy148:
+		YYDEBUG(148, *YYCURSOR);
+		++YYCURSOR;
+yy149:
+		YYDEBUG(149, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 540 "Zend/zend_ini_scanner.l"
+		{ /* End of option value */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 2073 "Zend/zend_ini_scanner.c"
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy157;
+		goto yy149;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy153;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy153:
+		YYDEBUG(153, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy152;
+		}
+		if (yych >= '\r') goto yy156;
+yy154:
+		YYDEBUG(154, *YYCURSOR);
+		++YYCURSOR;
+yy155:
+		YYDEBUG(155, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 636 "Zend/zend_ini_scanner.l"
+		{ /* Comment */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 2107 "Zend/zend_ini_scanner.c"
+yy156:
+		YYDEBUG(156, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy154;
+		goto yy155;
+yy157:
+		YYDEBUG(157, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy149;
+yy158:
+		YYDEBUG(158, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy158;
+		}
+		if (yych <= '\f') {
+			if (yych == '\n') goto yy157;
+		} else {
+			if (yych <= '\r') goto yy161;
+			if (yych == ';') goto yy152;
+		}
+		YYDEBUG(160, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 626 "Zend/zend_ini_scanner.l"
+		{
+	/* eat whitespace */
+	goto restart;
+}
+#line 2141 "Zend/zend_ini_scanner.c"
+yy161:
+		YYDEBUG(161, *YYCURSOR);
+		++YYCURSOR;
+		if ((yych = *YYCURSOR) == '\n') goto yy157;
+		goto yy149;
+	}
+/* *********************************** */
+yyc_ST_SECTION_RAW:
+	{
+		static const unsigned char yybm[] = {
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 192,   0, 128, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			192, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(162, *YYCURSOR);
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\n') goto yy166;
+		} else {
+			if (yych <= '\r') goto yy166;
+			if (yych == ']') goto yy168;
+		}
+		YYDEBUG(164, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy175;
+yy165:
+		YYDEBUG(165, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 536 "Zend/zend_ini_scanner.l"
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 2205 "Zend/zend_ini_scanner.c"
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(167, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 654 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 2215 "Zend/zend_ini_scanner.c"
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy171;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 424 "Zend/zend_ini_scanner.l"
+		{ /* End of section */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return ']';
+}
+#line 2230 "Zend/zend_ini_scanner.c"
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy171:
+		YYDEBUG(171, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy170;
+		}
+		if (yych == '\n') goto yy172;
+		if (yych == '\r') goto yy173;
+		goto yy169;
+yy172:
+		YYDEBUG(172, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy169;
+yy173:
+		YYDEBUG(173, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy172;
+		goto yy169;
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy175:
+		YYDEBUG(175, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy174;
+		}
+		goto yy165;
+	}
+/* *********************************** */
+yyc_ST_SECTION_VALUE:
+	{
+		static const unsigned char yybm[] = {
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 134, 128, 132, 132, 128, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			134, 132, 128, 132, 136, 132, 132,   0, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			228, 228, 228, 228, 228, 228, 228, 228, 
+			228, 228, 132, 128, 132, 132, 132, 132, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 144, 128, 132, 164, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+		};
+		YYDEBUG(176, *YYCURSOR);
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '-') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy178;
+					if (yych <= '\t') goto yy180;
+					goto yy181;
+				} else {
+					if (yych == '\r') goto yy181;
+					if (yych >= ' ') goto yy180;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych == '"') goto yy183;
+					if (yych >= '$') goto yy185;
+				} else {
+					if (yych == '\'') goto yy186;
+					if (yych >= '-') goto yy187;
+				}
+			}
+		} else {
+			if (yych <= 'Z') {
+				if (yych <= '9') {
+					if (yych <= '.') goto yy188;
+					if (yych >= '0') goto yy189;
+				} else {
+					if (yych == ';') goto yy181;
+					if (yych >= 'A') goto yy191;
+				}
+			} else {
+				if (yych <= '^') {
+					if (yych <= '[') goto yy178;
+					if (yych <= '\\') goto yy193;
+					if (yych <= ']') goto yy194;
+				} else {
+					if (yych == '`') goto yy178;
+					if (yych <= 'z') goto yy191;
+				}
+			}
+		}
+yy178:
+		YYDEBUG(178, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy201;
+yy179:
+		YYDEBUG(179, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 572 "Zend/zend_ini_scanner.l"
+		{ /* Get rest as section/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+#line 2356 "Zend/zend_ini_scanner.c"
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy227;
+			goto yy201;
+		} else {
+			if (yych <= ' ') goto yy227;
+			if (yych == '"') goto yy229;
+			goto yy201;
+		}
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		++YYCURSOR;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 654 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 2379 "Zend/zend_ini_scanner.c"
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		++YYCURSOR;
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 576 "Zend/zend_ini_scanner.l"
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
+	return '"';
+}
+#line 2391 "Zend/zend_ini_scanner.c"
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy182;
+			if (yych <= '[') goto yy200;
+			goto yy205;
+		} else {
+			if (yych == '{') goto yy225;
+			goto yy200;
+		}
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy221;
+		}
+		goto yy182;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy201;
+		if (yych <= '9') goto yy219;
+		goto yy201;
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy201;
+		if (yych <= '9') goto yy217;
+		goto yy201;
+yy189:
+		YYDEBUG(189, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy190;
+				if (yych <= '\f') goto yy201;
+			} else {
+				if (yych == '"') goto yy190;
+				if (yych <= '&') goto yy201;
+			}
+		} else {
+			if (yych <= '9') {
+				if (yych == '.') goto yy213;
+				if (yych <= '/') goto yy201;
+				goto yy215;
+			} else {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy201;
+				} else {
+					if (yych != ']') goto yy201;
+				}
+			}
+		}
+yy190:
+		YYDEBUG(190, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 550 "Zend/zend_ini_scanner.l"
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+#line 2457 "Zend/zend_ini_scanner.c"
+yy191:
+		YYDEBUG(191, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy211;
+		}
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych != '\n') goto yy201;
+			} else {
+				if (yych <= '\r') goto yy192;
+				if (yych <= '!') goto yy201;
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych != '\'') goto yy201;
+			} else {
+				if (yych <= ';') goto yy192;
+				if (yych != ']') goto yy201;
+			}
+		}
+yy192:
+		YYDEBUG(192, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 546 "Zend/zend_ini_scanner.l"
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+#line 2487 "Zend/zend_ini_scanner.c"
+yy193:
+		YYDEBUG(193, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy200;
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy197;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 424 "Zend/zend_ini_scanner.l"
+		{ /* End of section */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return ']';
+}
+#line 2506 "Zend/zend_ini_scanner.c"
+yy196:
+		YYDEBUG(196, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy196;
+		}
+		if (yych == '\n') goto yy198;
+		if (yych == '\r') goto yy199;
+		goto yy195;
+yy198:
+		YYDEBUG(198, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy195;
+yy199:
+		YYDEBUG(199, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy198;
+		goto yy195;
+yy200:
+		YYDEBUG(200, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy201:
+		YYDEBUG(201, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy200;
+		}
+		if (yych == '$') goto yy203;
+		if (yych != '\\') goto yy179;
+yy202:
+		YYDEBUG(202, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		goto yy200;
+yy203:
+		YYDEBUG(203, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy204;
+			if (yych <= '[') goto yy200;
+			goto yy205;
+		} else {
+			if (yych != '{') goto yy200;
+		}
+yy204:
+		YYDEBUG(204, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 1) {
+			if (yyaccept == 0) {
+				goto yy179;
+			} else {
+				goto yy182;
+			}
+		} else {
+			if (yyaccept == 2) {
+				goto yy190;
+			} else {
+				goto yy192;
+			}
+		}
+yy205:
+		YYDEBUG(205, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy206;
+		}
+		if (yych == '\\') goto yy208;
+		goto yy200;
+yy206:
+		YYDEBUG(206, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(207, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy206;
+		}
+		if (yych == '\\') goto yy210;
+		goto yy200;
+yy208:
+		YYDEBUG(208, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(209, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy206;
+		}
+		if (yych == '\\') goto yy208;
+		goto yy200;
+yy210:
+		YYDEBUG(210, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy206;
+		}
+		if (yych == '\\') goto yy208;
+		goto yy200;
+yy211:
+		YYDEBUG(211, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(212, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy211;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy192;
+				if (yych <= '\f') goto yy200;
+				goto yy192;
+			} else {
+				if (yych == '"') goto yy192;
+				if (yych <= '#') goto yy200;
+				goto yy203;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy192;
+				if (yych <= ':') goto yy200;
+				goto yy192;
+			} else {
+				if (yych <= '[') goto yy200;
+				if (yych <= '\\') goto yy202;
+				if (yych <= ']') goto yy192;
+				goto yy200;
+			}
+		}
+yy213:
+		YYDEBUG(213, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(214, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy213;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy190;
+				if (yych <= '\f') goto yy200;
+				goto yy190;
+			} else {
+				if (yych == '"') goto yy190;
+				if (yych <= '#') goto yy200;
+				goto yy203;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy190;
+				if (yych <= ':') goto yy200;
+				goto yy190;
+			} else {
+				if (yych <= '[') goto yy200;
+				if (yych <= '\\') goto yy202;
+				if (yych <= ']') goto yy190;
+				goto yy200;
+			}
+		}
+yy215:
+		YYDEBUG(215, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(216, *YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= '!') {
+				if (yych <= '\n') {
+					if (yych <= '\t') goto yy200;
+					goto yy190;
+				} else {
+					if (yych == '\r') goto yy190;
+					goto yy200;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= '"') goto yy190;
+					goto yy200;
+				} else {
+					if (yych <= '$') goto yy203;
+					if (yych <= '&') goto yy200;
+					goto yy190;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '.') {
+					if (yych <= '-') goto yy200;
+					goto yy213;
+				} else {
+					if (yych <= '/') goto yy200;
+					if (yych <= '9') goto yy215;
+					goto yy200;
+				}
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy190;
+					goto yy200;
+				} else {
+					if (yych <= '\\') goto yy202;
+					if (yych <= ']') goto yy190;
+					goto yy200;
+				}
+			}
+		}
+yy217:
+		YYDEBUG(217, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(218, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy190;
+				if (yych <= '\f') goto yy200;
+				goto yy190;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy200;
+					goto yy190;
+				} else {
+					if (yych == '$') goto yy203;
+					goto yy200;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy190;
+				if (yych <= '/') goto yy200;
+				if (yych <= '9') goto yy217;
+				goto yy200;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy190;
+					goto yy200;
+				} else {
+					if (yych <= '\\') goto yy202;
+					if (yych <= ']') goto yy190;
+					goto yy200;
+				}
+			}
+		}
+yy219:
+		YYDEBUG(219, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(220, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy190;
+				if (yych <= '\f') goto yy200;
+				goto yy190;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy200;
+					goto yy190;
+				} else {
+					if (yych == '$') goto yy203;
+					goto yy200;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy190;
+				if (yych <= '/') goto yy200;
+				if (yych <= '9') goto yy219;
+				goto yy200;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy190;
+					goto yy200;
+				} else {
+					if (yych <= '\\') goto yy202;
+					if (yych <= ']') goto yy190;
+					goto yy200;
+				}
+			}
+		}
+yy221:
+		YYDEBUG(221, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(222, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy221;
+		}
+		YYDEBUG(223, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(224, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 415 "Zend/zend_ini_scanner.l"
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 2827 "Zend/zend_ini_scanner.c"
+yy225:
+		YYDEBUG(225, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(226, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 448 "Zend/zend_ini_scanner.l"
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME TSRMLS_CC);
+	return TC_DOLLAR_CURLY;
+}
+#line 2838 "Zend/zend_ini_scanner.c"
+yy227:
+		YYDEBUG(227, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(228, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) goto yy200;
+				if (yych <= '\t') goto yy227;
+				if (yych <= '\n') goto yy179;
+				goto yy200;
+			} else {
+				if (yych <= 0x1F) {
+					if (yych <= '\r') goto yy179;
+					goto yy200;
+				} else {
+					if (yych <= ' ') goto yy227;
+					if (yych <= '!') goto yy200;
+				}
+			}
+		} else {
+			if (yych <= ':') {
+				if (yych <= '$') {
+					if (yych <= '#') goto yy200;
+					goto yy203;
+				} else {
+					if (yych == '\'') goto yy179;
+					goto yy200;
+				}
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy179;
+					goto yy200;
+				} else {
+					if (yych <= '\\') goto yy202;
+					if (yych <= ']') goto yy179;
+					goto yy200;
+				}
+			}
+		}
+yy229:
+		YYDEBUG(229, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy184;
+	}
+/* *********************************** */
+yyc_ST_VALUE:
+	{
+		static const unsigned char yybm[] = {
+			160, 162, 162, 162, 162, 162, 162, 162, 
+			162, 176, 128, 162, 162, 128, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			176, 160, 160, 162, 168, 162, 160,  32, 
+			160, 160, 162, 162, 162, 162, 162, 162, 
+			230, 230, 230, 230, 230, 230, 230, 230, 
+			230, 230, 162, 160, 162, 160, 162, 162, 
+			162, 166, 166, 166, 166, 166, 166, 166, 
+			166, 166, 166, 166, 166, 166, 166, 166, 
+			166, 166, 166, 166, 166, 166, 166, 166, 
+			166, 166, 166, 162, 162, 162, 160, 166, 
+			162, 166, 166, 166, 166, 166, 166, 166, 
+			166, 166, 166, 166, 166, 166, 166, 166, 
+			166, 166, 166, 166, 166, 166, 166, 166, 
+			166, 166, 166, 162, 160, 162, 160, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+			162, 162, 162, 162, 162, 162, 162, 162, 
+		};
+		YYDEBUG(230, *YYCURSOR);
+		YYFILL(6);
+		yych = *YYCURSOR;
+		YYDEBUG(-1, yych);
+		switch (yych) {
+		case 0x00:	goto yy232;
+		case '\t':
+		case ' ':	goto yy236;
+		case '\n':	goto yy238;
+		case '\r':	goto yy240;
+		case '!':
+		case '&':
+		case '(':
+		case ')':
+		case '^':
+		case '|':
+		case '~':	goto yy241;
+		case '"':	goto yy243;
+		case '$':	goto yy245;
+		case '\'':	goto yy246;
+		case '-':	goto yy247;
+		case '.':	goto yy248;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':	goto yy249;
+		case ';':	goto yy251;
+		case '=':	goto yy252;
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'D':
+		case 'E':
+		case 'G':
+		case 'H':
+		case 'I':
+		case 'J':
+		case 'K':
+		case 'L':
+		case 'M':
+		case 'P':
+		case 'Q':
+		case 'R':
+		case 'S':
+		case 'U':
+		case 'V':
+		case 'W':
+		case 'X':
+		case 'Z':
+		case '_':
+		case 'a':
+		case 'b':
+		case 'c':
+		case 'd':
+		case 'e':
+		case 'g':
+		case 'h':
+		case 'i':
+		case 'j':
+		case 'k':
+		case 'l':
+		case 'm':
+		case 'p':
+		case 'q':
+		case 'r':
+		case 's':
+		case 'u':
+		case 'v':
+		case 'w':
+		case 'x':
+		case 'z':	goto yy254;
+		case 'F':
+		case 'f':	goto yy256;
+		case 'N':
+		case 'n':	goto yy257;
+		case 'O':
+		case 'o':	goto yy258;
+		case 'T':
+		case 't':	goto yy259;
+		case 'Y':
+		case 'y':	goto yy260;
+		default:	goto yy234;
+		}
+yy232:
+		YYDEBUG(232, *YYCURSOR);
+		++YYCURSOR;
+yy233:
+		YYDEBUG(233, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 649 "Zend/zend_ini_scanner.l"
+		{ /* End of option value (if EOF is reached before EOL */
+	BEGIN(INITIAL);
+	return END_OF_LINE;
+}
+#line 3024 "Zend/zend_ini_scanner.c"
+yy234:
+		YYDEBUG(234, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy262;
+yy235:
+		YYDEBUG(235, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 568 "Zend/zend_ini_scanner.l"
+		{ /* Get everything else as option/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+#line 3037 "Zend/zend_ini_scanner.c"
+yy236:
+		YYDEBUG(236, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy316;
+yy237:
+		YYDEBUG(237, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 622 "Zend/zend_ini_scanner.l"
+		{
+	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
+}
+#line 3050 "Zend/zend_ini_scanner.c"
+yy238:
+		YYDEBUG(238, *YYCURSOR);
+		++YYCURSOR;
+yy239:
+		YYDEBUG(239, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 540 "Zend/zend_ini_scanner.l"
+		{ /* End of option value */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 3063 "Zend/zend_ini_scanner.c"
+yy240:
+		YYDEBUG(240, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy314;
+		goto yy239;
+yy241:
+		YYDEBUG(241, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy313;
+yy242:
+		YYDEBUG(242, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 558 "Zend/zend_ini_scanner.l"
+		{ /* Boolean operators */
+	return yytext[0];
+}
+#line 3081 "Zend/zend_ini_scanner.c"
+yy243:
+		YYDEBUG(243, *YYCURSOR);
+		++YYCURSOR;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 576 "Zend/zend_ini_scanner.l"
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
+	return '"';
+}
+#line 3093 "Zend/zend_ini_scanner.c"
+yy245:
+		YYDEBUG(245, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy233;
+			if (yych <= '[') goto yy261;
+			goto yy268;
+		} else {
+			if (yych == '{') goto yy310;
+			goto yy261;
+		}
+yy246:
+		YYDEBUG(246, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy306;
+		}
+		goto yy233;
+yy247:
+		YYDEBUG(247, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy262;
+		if (yych <= '9') goto yy304;
+		goto yy262;
+yy248:
+		YYDEBUG(248, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy262;
+		if (yych <= '9') goto yy302;
+		goto yy262;
+yy249:
+		YYDEBUG(249, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy262;
+				} else {
+					if (yych != '\r') goto yy262;
+				}
+			} else {
+				if (yych <= ')') {
+					if (yych <= '"') goto yy250;
+					if (yych <= '%') goto yy262;
+				} else {
+					if (yych == '.') goto yy298;
+					goto yy262;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy300;
+					if (yych <= ':') goto yy262;
+				} else {
+					if (yych != '=') goto yy262;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy250;
+					if (yych <= '{') goto yy262;
+				} else {
+					if (yych != '~') goto yy262;
+				}
+			}
+		}
+yy250:
+		YYDEBUG(250, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 550 "Zend/zend_ini_scanner.l"
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+#line 3172 "Zend/zend_ini_scanner.c"
+yy251:
+		YYDEBUG(251, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		goto yy294;
+yy252:
+		YYDEBUG(252, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(253, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 562 "Zend/zend_ini_scanner.l"
+		{ /* Make = used in option value to trigger error */
+	yyless(0);
+	BEGIN(INITIAL);
+	return END_OF_LINE;
+}
+#line 3189 "Zend/zend_ini_scanner.c"
+yy254:
+		YYDEBUG(254, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy263;
+		}
+		if (yych <= ':') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy262;
+				} else {
+					if (yych <= '\n') goto yy255;
+					if (yych <= '\f') goto yy262;
+				}
+			} else {
+				if (yych <= '"') {
+					if (yych <= 0x1F) goto yy262;
+				} else {
+					if (yych <= '%') goto yy262;
+					if (yych >= '*') goto yy262;
+				}
+			}
+		} else {
+			if (yych <= '^') {
+				if (yych <= '<') {
+					if (yych >= '<') goto yy262;
+				} else {
+					if (yych <= '=') goto yy255;
+					if (yych <= ']') goto yy262;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '{') goto yy262;
+				} else {
+					if (yych != '~') goto yy262;
+				}
+			}
+		}
+yy255:
+		YYDEBUG(255, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 546 "Zend/zend_ini_scanner.l"
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+#line 3236 "Zend/zend_ini_scanner.c"
+yy256:
+		YYDEBUG(256, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '<') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '/') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					goto yy262;
+				} else {
+					if (yych <= '9') goto yy263;
+					if (yych == ';') goto yy255;
+					goto yy262;
+				}
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= 'A') {
+					if (yych <= '=') goto yy255;
+					if (yych <= '@') goto yy262;
+					goto yy290;
+				} else {
+					if (yych <= 'Z') goto yy263;
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					goto yy263;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych <= '`') goto yy262;
+					if (yych <= 'a') goto yy290;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy257:
+		YYDEBUG(257, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'N') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					if (yych <= '\n') goto yy255;
+					goto yy262;
+				} else {
+					if (yych <= '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					if (yych <= '"') goto yy255;
+					goto yy262;
+				}
+			} else {
+				if (yych <= ':') {
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					if (yych <= '9') goto yy263;
+					goto yy262;
+				} else {
+					if (yych <= '<') {
+						if (yych <= ';') goto yy255;
+						goto yy262;
+					} else {
+						if (yych <= '=') goto yy255;
+						if (yych <= '@') goto yy262;
+						goto yy263;
+					}
+				}
+			}
+		} else {
+			if (yych <= 'n') {
+				if (yych <= 'Z') {
+					if (yych <= 'O') goto yy282;
+					if (yych == 'U') goto yy283;
+					goto yy263;
+				} else {
+					if (yych <= '^') {
+						if (yych <= ']') goto yy262;
+						goto yy255;
+					} else {
+						if (yych == '`') goto yy262;
+						goto yy263;
+					}
+				}
+			} else {
+				if (yych <= 'z') {
+					if (yych <= 'o') goto yy282;
+					if (yych == 'u') goto yy283;
+					goto yy263;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy262;
+						goto yy255;
+					} else {
+						if (yych == '~') goto yy255;
+						goto yy262;
+					}
+				}
+			}
+		}
+yy258:
+		YYDEBUG(258, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					if (yych <= '\n') goto yy255;
+					goto yy262;
+				} else {
+					if (yych <= '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					if (yych <= '"') goto yy255;
+					goto yy262;
+				}
+			} else {
+				if (yych <= ':') {
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					if (yych <= '9') goto yy263;
+					goto yy262;
+				} else {
+					if (yych <= '<') {
+						if (yych <= ';') goto yy255;
+						goto yy262;
+					} else {
+						if (yych <= '=') goto yy255;
+						if (yych <= '@') goto yy262;
+						goto yy263;
+					}
+				}
+			}
+		} else {
+			if (yych <= 'e') {
+				if (yych <= 'Z') {
+					if (yych <= 'F') goto yy277;
+					if (yych == 'N') goto yy271;
+					goto yy263;
+				} else {
+					if (yych <= '^') {
+						if (yych <= ']') goto yy262;
+						goto yy255;
+					} else {
+						if (yych == '`') goto yy262;
+						goto yy263;
+					}
+				}
+			} else {
+				if (yych <= 'z') {
+					if (yych <= 'f') goto yy277;
+					if (yych == 'n') goto yy271;
+					goto yy263;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy262;
+						goto yy255;
+					} else {
+						if (yych == '~') goto yy255;
+						goto yy262;
+					}
+				}
+			}
+		}
+yy259:
+		YYDEBUG(259, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych == 'R') goto yy275;
+					goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'r') goto yy275;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy260:
+		YYDEBUG(260, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych == 'E') goto yy265;
+					goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'e') goto yy265;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy261:
+		YYDEBUG(261, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy262:
+		YYDEBUG(262, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy261;
+		}
+		if (yych == '$') goto yy266;
+		goto yy235;
+yy263:
+		YYDEBUG(263, *YYCURSOR);
+		yyaccept = 4;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(264, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy263;
+		}
+		if (yych <= ')') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) {
+					if (yych <= 0x00) goto yy255;
+					goto yy261;
+				} else {
+					if (yych <= '\n') goto yy255;
+					if (yych <= '\f') goto yy261;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= 0x1F) goto yy261;
+					if (yych <= '"') goto yy255;
+					goto yy261;
+				} else {
+					if (yych <= '$') goto yy266;
+					if (yych <= '%') goto yy261;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy261;
+					goto yy255;
+				} else {
+					if (yych == '=') goto yy255;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy255;
+					if (yych <= '{') goto yy261;
+					goto yy255;
+				} else {
+					if (yych == '~') goto yy255;
+					goto yy261;
+				}
+			}
+		}
+yy265:
+		YYDEBUG(265, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych == 'S') goto yy271;
+					goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 's') goto yy271;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy266:
+		YYDEBUG(266, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy267;
+			if (yych <= '[') goto yy261;
+			goto yy268;
+		} else {
+			if (yych != '{') goto yy261;
+		}
+yy267:
+		YYDEBUG(267, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 3) {
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy235;
+				} else {
+					goto yy237;
+				}
+			} else {
+				if (yyaccept == 2) {
+					goto yy233;
+				} else {
+					goto yy250;
+				}
+			}
+		} else {
+			if (yyaccept <= 5) {
+				if (yyaccept == 4) {
+					goto yy255;
+				} else {
+					goto yy272;
+				}
+			} else {
+				if (yyaccept == 6) {
+					goto yy279;
+				} else {
+					goto yy286;
+				}
+			}
+		}
+yy268:
+		YYDEBUG(268, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy269;
+		}
+		goto yy261;
+yy269:
+		YYDEBUG(269, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(270, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy269;
+		}
+		if (yych <= 0x00) goto yy235;
+		if (yych == '\\') goto yy268;
+		goto yy261;
+yy271:
+		YYDEBUG(271, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy273;
+		}
+		if (yych <= ';') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy272;
+					if (yych <= '\t') goto yy262;
+				} else {
+					if (yych != '\r') goto yy262;
+				}
+			} else {
+				if (yych <= ')') {
+					if (yych <= '"') goto yy272;
+					if (yych <= '%') goto yy262;
+				} else {
+					if (yych <= '/') goto yy262;
+					if (yych <= '9') goto yy263;
+					if (yych <= ':') goto yy262;
+				}
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= '@') {
+					if (yych != '=') goto yy262;
+				} else {
+					if (yych <= 'Z') goto yy263;
+					if (yych <= ']') goto yy262;
+					if (yych >= '_') goto yy263;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych <= '`') goto yy262;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych >= 0x7F) goto yy262;
+				}
+			}
+		}
+yy272:
+		YYDEBUG(272, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 468 "Zend/zend_ini_scanner.l"
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+	RETURN_TOKEN(BOOL_TRUE, "1", 1);
+}
+#line 3752 "Zend/zend_ini_scanner.c"
+yy273:
+		YYDEBUG(273, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(274, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy273;
+		}
+		goto yy272;
+yy275:
+		YYDEBUG(275, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych != 'U') goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'u') goto yy276;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy276:
+		YYDEBUG(276, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych == 'E') goto yy271;
+					goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'e') goto yy271;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy277:
+		YYDEBUG(277, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych != 'F') goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'f') goto yy278;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy278:
+		YYDEBUG(278, *YYCURSOR);
+		yyaccept = 6;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy263;
+		}
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy262;
+				} else {
+					if (yych <= '\t') goto yy280;
+					if (yych >= '\v') goto yy262;
+				}
+			} else {
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy279;
+					if (yych <= 0x1F) goto yy262;
+					goto yy280;
+				} else {
+					if (yych <= '"') goto yy279;
+					if (yych <= '%') goto yy262;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy262;
+				} else {
+					if (yych != '=') goto yy262;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy279;
+					if (yych <= '{') goto yy262;
+				} else {
+					if (yych != '~') goto yy262;
+				}
+			}
+		}
+yy279:
+		YYDEBUG(279, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 472 "Zend/zend_ini_scanner.l"
+		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
+	RETURN_TOKEN(BOOL_FALSE, "", 0);
+}
+#line 3962 "Zend/zend_ini_scanner.c"
+yy280:
+		YYDEBUG(280, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(281, *YYCURSOR);
+		if (yych == '\t') goto yy280;
+		if (yych == ' ') goto yy280;
+		goto yy279;
+yy282:
+		YYDEBUG(282, *YYCURSOR);
+		yyaccept = 6;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '<') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy279;
+					if (yych <= 0x08) goto yy262;
+					if (yych <= '\t') goto yy280;
+					goto yy279;
+				} else {
+					if (yych == '\r') goto yy279;
+					if (yych <= 0x1F) goto yy262;
+					goto yy280;
+				}
+			} else {
+				if (yych <= '/') {
+					if (yych <= '"') goto yy279;
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy279;
+					goto yy262;
+				} else {
+					if (yych <= '9') goto yy263;
+					if (yych == ';') goto yy279;
+					goto yy262;
+				}
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= 'N') {
+					if (yych <= '=') goto yy279;
+					if (yych <= '@') goto yy262;
+					if (yych <= 'M') goto yy263;
+					goto yy289;
+				} else {
+					if (yych <= 'Z') goto yy263;
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy279;
+					goto yy263;
+				}
+			} else {
+				if (yych <= 'z') {
+					if (yych <= '`') goto yy262;
+					if (yych == 'n') goto yy289;
+					goto yy263;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy262;
+						goto yy279;
+					} else {
+						if (yych == '~') goto yy279;
+						goto yy262;
+					}
+				}
+			}
+		}
+yy283:
+		YYDEBUG(283, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych != 'L') goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'l') goto yy284;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy284:
+		YYDEBUG(284, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych != 'L') goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'l') goto yy285;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy285:
+		YYDEBUG(285, *YYCURSOR);
+		yyaccept = 7;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy263;
+		}
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy262;
+				} else {
+					if (yych <= '\t') goto yy287;
+					if (yych >= '\v') goto yy262;
+				}
+			} else {
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy286;
+					if (yych <= 0x1F) goto yy262;
+					goto yy287;
+				} else {
+					if (yych <= '"') goto yy286;
+					if (yych <= '%') goto yy262;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy262;
+				} else {
+					if (yych != '=') goto yy262;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy286;
+					if (yych <= '{') goto yy262;
+				} else {
+					if (yych != '~') goto yy262;
+				}
+			}
+		}
+yy286:
+		YYDEBUG(286, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 476 "Zend/zend_ini_scanner.l"
+		{
+	RETURN_TOKEN(NULL_NULL, "", 0);
+}
+#line 4177 "Zend/zend_ini_scanner.c"
+yy287:
+		YYDEBUG(287, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(288, *YYCURSOR);
+		if (yych == '\t') goto yy287;
+		if (yych == ' ') goto yy287;
+		goto yy286;
+yy289:
+		YYDEBUG(289, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych == 'E') goto yy278;
+					goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'e') goto yy278;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy290:
+		YYDEBUG(290, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych != 'L') goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'l') goto yy291;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy291:
+		YYDEBUG(291, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych != 'S') goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 's') goto yy292;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy292:
+		YYDEBUG(292, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy255;
+					if (yych <= 0x08) goto yy262;
+					goto yy255;
+				} else {
+					if (yych == '\r') goto yy255;
+					if (yych <= 0x1F) goto yy262;
+					goto yy255;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy262;
+					if (yych <= ')') goto yy255;
+					if (yych <= '/') goto yy262;
+					goto yy263;
+				} else {
+					if (yych == ';') goto yy255;
+					if (yych <= '<') goto yy262;
+					goto yy255;
+				}
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy262;
+					if (yych == 'E') goto yy278;
+					goto yy263;
+				} else {
+					if (yych <= ']') goto yy262;
+					if (yych <= '^') goto yy255;
+					if (yych <= '_') goto yy263;
+					goto yy262;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == 'e') goto yy278;
+					if (yych <= 'z') goto yy263;
+					goto yy262;
+				} else {
+					if (yych == '}') goto yy262;
+					if (yych <= '~') goto yy255;
+					goto yy262;
+				}
+			}
+		}
+yy293:
+		YYDEBUG(293, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy294:
+		YYDEBUG(294, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy293;
+		}
+		if (yych >= '\r') goto yy297;
+yy295:
+		YYDEBUG(295, *YYCURSOR);
+		++YYCURSOR;
+yy296:
+		YYDEBUG(296, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 636 "Zend/zend_ini_scanner.l"
+		{ /* Comment */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+#line 4412 "Zend/zend_ini_scanner.c"
+yy297:
+		YYDEBUG(297, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy295;
+		goto yy296;
+yy298:
+		YYDEBUG(298, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(299, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy298;
+		}
+		if (yych <= ')') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) {
+					if (yych <= 0x00) goto yy250;
+					goto yy261;
+				} else {
+					if (yych <= '\n') goto yy250;
+					if (yych <= '\f') goto yy261;
+					goto yy250;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= 0x1F) goto yy261;
+					if (yych <= '"') goto yy250;
+					goto yy261;
+				} else {
+					if (yych <= '$') goto yy266;
+					if (yych <= '%') goto yy261;
+					goto yy250;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '=') goto yy250;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy250;
+					if (yych <= '{') goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '~') goto yy250;
+					goto yy261;
+				}
+			}
+		}
+yy300:
+		YYDEBUG(300, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(301, *YYCURSOR);
+		if (yych <= '.') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '\r') goto yy250;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych <= '"') goto yy250;
+					if (yych <= '#') goto yy261;
+					goto yy266;
+				} else {
+					if (yych <= '%') goto yy261;
+					if (yych <= ')') goto yy250;
+					if (yych <= '-') goto yy261;
+					goto yy298;
+				}
+			}
+		} else {
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '/') goto yy261;
+					if (yych <= '9') goto yy300;
+					goto yy261;
+				} else {
+					if (yych == '<') goto yy261;
+					goto yy250;
+				}
+			} else {
+				if (yych <= '{') {
+					if (yych == '^') goto yy250;
+					goto yy261;
+				} else {
+					if (yych == '}') goto yy261;
+					if (yych <= '~') goto yy250;
+					goto yy261;
+				}
+			}
+		}
+yy302:
+		YYDEBUG(302, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(303, *YYCURSOR);
+		if (yych <= '/') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '\r') goto yy250;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych <= '"') goto yy250;
+					if (yych <= '#') goto yy261;
+					goto yy266;
+				} else {
+					if (yych <= '%') goto yy261;
+					if (yych <= ')') goto yy250;
+					goto yy261;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy302;
+					if (yych <= ':') goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '=') goto yy250;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy250;
+					if (yych <= '{') goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '~') goto yy250;
+					goto yy261;
+				}
+			}
+		}
+yy304:
+		YYDEBUG(304, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(305, *YYCURSOR);
+		if (yych <= '/') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy250;
+					if (yych <= 0x08) goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '\r') goto yy250;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '$') {
+					if (yych <= '"') goto yy250;
+					if (yych <= '#') goto yy261;
+					goto yy266;
+				} else {
+					if (yych <= '%') goto yy261;
+					if (yych <= ')') goto yy250;
+					goto yy261;
+				}
+			}
+		} else {
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy304;
+					if (yych <= ':') goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '=') goto yy250;
+					goto yy261;
+				}
+			} else {
+				if (yych <= '|') {
+					if (yych <= '^') goto yy250;
+					if (yych <= '{') goto yy261;
+					goto yy250;
+				} else {
+					if (yych == '~') goto yy250;
+					goto yy261;
+				}
+			}
+		}
+yy306:
+		YYDEBUG(306, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(307, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy306;
+		}
+		YYDEBUG(308, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(309, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 415 "Zend/zend_ini_scanner.l"
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 4639 "Zend/zend_ini_scanner.c"
+yy310:
+		YYDEBUG(310, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(311, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 448 "Zend/zend_ini_scanner.l"
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME TSRMLS_CC);
+	return TC_DOLLAR_CURLY;
+}
+#line 4650 "Zend/zend_ini_scanner.c"
+yy312:
+		YYDEBUG(312, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy313:
+		YYDEBUG(313, *YYCURSOR);
+		if (yych == '\t') goto yy312;
+		if (yych == ' ') goto yy312;
+		goto yy242;
+yy314:
+		YYDEBUG(314, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy239;
+yy315:
+		YYDEBUG(315, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy316:
+		YYDEBUG(316, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych <= 0x08) goto yy237;
+				if (yych <= '\t') goto yy315;
+				goto yy314;
+			} else {
+				if (yych == '\r') goto yy318;
+				goto yy237;
+			}
+		} else {
+			if (yych <= '"') {
+				if (yych <= ' ') goto yy315;
+				if (yych <= '!') goto yy237;
+			} else {
+				if (yych == ';') goto yy293;
+				goto yy237;
+			}
+		}
+		YYDEBUG(317, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy244;
+yy318:
+		YYDEBUG(318, *YYCURSOR);
+		++YYCURSOR;
+		if ((yych = *YYCURSOR) == '\n') goto yy314;
+		goto yy239;
+	}
+/* *********************************** */
+yyc_ST_VARNAME:
+	{
+		static const unsigned char yybm[] = {
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128,   0,   0, 128, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128,   0,   0, 128,   0, 128,   0, 128, 
+			  0,   0, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0, 128, 128,   0, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(319, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= ')') {
+			if (yych <= '"') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy321;
+					if (yych <= '\n') goto yy323;
+				} else {
+					if (yych <= '\r') goto yy323;
+					if (yych >= '!') goto yy323;
+				}
+			} else {
+				if (yych <= '%') {
+					if (yych == '$') goto yy323;
+				} else {
+					if (yych != '\'') goto yy323;
+				}
+			}
+		} else {
+			if (yych <= '[') {
+				if (yych <= '<') {
+					if (yych == ';') goto yy323;
+				} else {
+					if (yych <= '=') goto yy323;
+					if (yych >= '[') goto yy323;
+				}
+			} else {
+				if (yych <= 'z') {
+					if (yych == '^') goto yy323;
+				} else {
+					if (yych == '}') goto yy325;
+					if (yych <= '~') goto yy323;
+				}
+			}
+		}
+yy321:
+		YYDEBUG(321, *YYCURSOR);
+		++YYCURSOR;
+		yych = *YYCURSOR;
+		goto yy328;
+yy322:
+		YYDEBUG(322, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 453 "Zend/zend_ini_scanner.l"
+		{ /* Variable name */
+	/* Eat leading whitespace */
+	EAT_LEADING_WHITESPACE();
+
+	/* Eat trailing whitespace */
+	EAT_TRAILING_WHITESPACE();
+
+	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
+}
+#line 4791 "Zend/zend_ini_scanner.c"
+yy323:
+		YYDEBUG(323, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(324, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 654 "Zend/zend_ini_scanner.l"
+		{
+	return 0;
+}
+#line 4801 "Zend/zend_ini_scanner.c"
+yy325:
+		YYDEBUG(325, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(326, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+#line 463 "Zend/zend_ini_scanner.l"
+		{ /* Variable end */
+	yy_pop_state(TSRMLS_C);
+	return '}';
+}
+#line 4812 "Zend/zend_ini_scanner.c"
+yy327:
+		YYDEBUG(327, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy328:
+		YYDEBUG(328, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy327;
+		}
+		goto yy322;
+	}
+}
+#line 658 "Zend/zend_ini_scanner.l"
+
+}
diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h
index aafe7efdd..763a78ada 100644
--- a/Zend/zend_ini_scanner.h
+++ b/Zend/zend_ini_scanner.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -25,6 +25,7 @@
 /* Scanner modes */
 #define ZEND_INI_SCANNER_NORMAL 0 /* Normal mode. [DEFAULT] */
 #define ZEND_INI_SCANNER_RAW    1 /* Raw mode. Option values are not parsed */
+#define ZEND_INI_SCANNER_TYPED  2 /* Typed mode. */
 
 BEGIN_EXTERN_C()
 int zend_ini_scanner_get_lineno(TSRMLS_D);
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 6207c76b2..fa586575f 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include "zend.h"
+#include "zend_API.h"
 #include "zend_globals.h"
 #include <zend_ini_parser.h>
 #include "zend_ini_scanner.h"
@@ -137,9 +138,55 @@ ZEND_API zend_ini_scanner_globals ini_scanner_globals;
 	Z_TYPE_P(retval) = IS_STRING;                \
 }
 
-#define RETURN_TOKEN(type, str, len) {           \
-	zend_ini_copy_value(ini_lval, str, len);     \
-	return type;                                 \
+#define RETURN_TOKEN(type, str, len) {                       \
+	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_TYPED) {      \
+		zend_ini_copy_typed_value(ini_lval, type, str, len); \
+	} else {                                                 \
+		zend_ini_copy_value(ini_lval, str, len);             \
+	}                                                        \
+	return type;                                             \
+}
+
+static inline int convert_to_number(zval *retval, const char *str, const int str_len)
+{
+	zend_uchar type;
+	int overflow;
+	long lval;
+	double dval;
+
+	if ((type = is_numeric_string_ex(str, str_len, &lval, &dval, 0, &overflow)) != 0) {
+		if (type == IS_LONG) {
+			ZVAL_LONG(retval, lval);
+			return SUCCESS;
+		} else if (type == IS_DOUBLE && !overflow) {
+			ZVAL_DOUBLE(retval, dval);
+			return SUCCESS;
+		}
+	}
+
+	return FAILURE;
+}
+
+static void zend_ini_copy_typed_value(zval *retval, const int type, const char *str, int len)
+{
+	switch (type) {
+		case BOOL_FALSE:
+		case BOOL_TRUE:
+			ZVAL_BOOL(retval, type == BOOL_TRUE);
+			break;
+
+		case NULL_NULL:
+			ZVAL_NULL(retval);
+			break;
+
+		case TC_NUMBER:
+			if (convert_to_number(retval, str, len) == SUCCESS) {
+				break;
+			}
+			/* intentional fall-through */
+		default:
+			zend_ini_copy_value(retval, str, len);
+	}
 }
 
 static void _yy_push_state(int new_state TSRMLS_DC)
@@ -172,7 +219,7 @@ static void yy_scan_buffer(char *str, unsigned int len TSRMLS_DC)
 static int init_ini_scanner(int scanner_mode, zend_file_handle *fh TSRMLS_DC)
 {
 	/* Sanity check */
-	if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW) {
+	if (scanner_mode != ZEND_INI_SCANNER_NORMAL && scanner_mode != ZEND_INI_SCANNER_RAW && scanner_mode != ZEND_INI_SCANNER_TYPED) {
 		zend_error(E_WARNING, "Invalid scanner mode");
 		return FAILURE;
 	}
@@ -422,10 +469,14 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
 
-<INITIAL,ST_VALUE>("false"|"off"|"no"|"none"|"null"){TABS_AND_SPACES}* { /* FALSE value (when used outside option value/offset this causes parse error!)*/
+<INITIAL,ST_VALUE>("false"|"off"|"no"|"none"){TABS_AND_SPACES}* { /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
 
+<INITIAL,ST_VALUE>("null"){TABS_AND_SPACES}* {
+	RETURN_TOKEN(NULL_NULL, "", 0);
+}
+
 <INITIAL>{LABEL} { /* Get option name */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 4b01eb3c4..7f57a6abd 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_interfaces.h b/Zend/zend_interfaces.h
index 7b70bc49d..f405ce9bc 100644
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_istdiostream.h b/Zend/zend_istdiostream.h
index 40fdb4310..d970cc1b8 100644
--- a/Zend/zend_istdiostream.h
+++ b/Zend/zend_istdiostream.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index a2854c4b7..5df880148 100644
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h
index 873f36efb..49e8f651b 100644
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_language_parser.c b/Zend/zend_language_parser.c
index d4a9e148c..3b1dddc97 100644
--- a/Zend/zend_language_parser.c
+++ b/Zend/zend_language_parser.c
@@ -80,7 +80,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 750272356..192589edd 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -3,7 +3,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index ae41cde77..eef35f8cb 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -4,7 +4,7 @@
    +----------------------------------------------------------------------+

    | Zend Engine                                                          |

    +----------------------------------------------------------------------+

-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |

+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |

    +----------------------------------------------------------------------+

    | This source file is subject to version 2.00 of the Zend license,     |

    | that is bundled with this package in the file LICENSE, and is        |

diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index 05345b2cc..8f273cac9 100644
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 4f50658a5..db2ceda3d 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 11c2c3356..b66b20747 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index b7980d56f..40ae54795 100644
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index ad74bd56c..488534684 100644
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index b05ece807..e33cc0734 100644
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 080d46168..358e672cf 100644
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c
index 75fcd638d..597b2ba71 100644
--- a/Zend/zend_multibyte.c
+++ b/Zend/zend_multibyte.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_multibyte.h b/Zend/zend_multibyte.h
index db2db1a97..e785ced12 100644
--- a/Zend/zend_multibyte.h
+++ b/Zend/zend_multibyte.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index 74dc7d145..e3fad33d0 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index c7adf38f3..0c43ba8ae 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -786,9 +786,6 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member, int type
 			/* we don't have access controls - will just add it */
 			new_zval = &EG(uninitialized_zval);
 
-			if(UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
-				zend_error(E_NOTICE, "Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member));
-			}
 			Z_ADDREF_P(new_zval);
 			if (EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&
 			    property_info->offset >= 0) {
@@ -808,6 +805,12 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member, int type
 				}
 				zend_hash_quick_update(zobj->properties, property_info->name, property_info->name_length+1, property_info->h, &new_zval, sizeof(zval *), (void **) &retval);
 			}
+
+			/* Notice is thrown after creation of the property, to avoid EG(std_property_info)
+			 * being overwritten in an error handler. */
+			if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
+				zend_error(E_NOTICE, "Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member));
+			}
 		} else {
 			/* we do have getter - fail and let it try again with usual get/set */
 			retval = NULL;
diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index 14418b9bf..295540b91 100644
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index da3aab551..c76ca89bd 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h
index d00c65a36..d32505dda 100644
--- a/Zend/zend_objects.h
+++ b/Zend/zend_objects.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index f7a6b0b4c..4727df424 100644
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index d8f2c5e38..0a4cda571 100644
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index bff314ef6..d6b015be9 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index ef21b47a4..242611643 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 1fab48126..8307d1ef4 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_ptr_stack.c b/Zend/zend_ptr_stack.c
index bb85a2cc2..79582713b 100644
--- a/Zend/zend_ptr_stack.c
+++ b/Zend/zend_ptr_stack.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index ecd7b7042..d786bc696 100644
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_qsort.c b/Zend/zend_qsort.c
index ea577e1c0..1e5763716 100644
--- a/Zend/zend_qsort.c
+++ b/Zend/zend_qsort.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_qsort.h b/Zend/zend_qsort.h
index c61a85d18..13c080885 100644
--- a/Zend/zend_qsort.h
+++ b/Zend/zend_qsort.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_sprintf.c b/Zend/zend_sprintf.c
index 64c9b727f..87caece23 100644
--- a/Zend/zend_sprintf.c
+++ b/Zend/zend_sprintf.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_stack.c b/Zend/zend_stack.c
index cf99499e7..f6a8f711d 100644
--- a/Zend/zend_stack.c
+++ b/Zend/zend_stack.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_stack.h b/Zend/zend_stack.h
index d48487946..eda1c239a 100644
--- a/Zend/zend_stack.h
+++ b/Zend/zend_stack.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_static_allocator.c b/Zend/zend_static_allocator.c
index 71338d211..60b12362f 100644
--- a/Zend/zend_static_allocator.c
+++ b/Zend/zend_static_allocator.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_static_allocator.h b/Zend/zend_static_allocator.h
index 751606570..0b816a011 100644
--- a/Zend/zend_static_allocator.h
+++ b/Zend/zend_static_allocator.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index 6d306b337..553bc2882 100644
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index 5306b496f..dade12961 100644
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_string.c b/Zend/zend_string.c
index f1162f0b4..e8b3252a9 100644
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 978426e7c..84dc135f4 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_strtod.h b/Zend/zend_strtod.h
index ba312d4f1..adfaec020 100644
--- a/Zend/zend_strtod.h
+++ b/Zend/zend_strtod.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c
index 100bcf188..6d4bc1bd9 100644
--- a/Zend/zend_ts_hash.c
+++ b/Zend/zend_ts_hash.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
@@ -151,7 +151,7 @@ ZEND_API void zend_ts_hash_graceful_destroy(TsHashTable *ht)
 
 #ifdef ZTS
 	tsrm_mutex_free(ht->mx_reader);
-	tsrm_mutex_free(ht->mx_reader);
+	tsrm_mutex_free(ht->mx_writer);
 #endif
 }
 
diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h
index e46acd52b..7e067fc8f 100644
--- a/Zend/zend_ts_hash.h
+++ b/Zend/zend_ts_hash.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index e5d5bbb50..08031f55e 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index 0f9e184b7..c2772ff13 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
@@ -137,8 +137,9 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC)
 				}
 				ALLOC_HASHTABLE_REL(tmp_ht);
 				zend_hash_init(tmp_ht, zend_hash_num_elements(original_ht), NULL, ZVAL_PTR_DTOR, 0);
-				zend_hash_copy(tmp_ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 				zvalue->value.ht = tmp_ht;
+				zend_hash_copy(tmp_ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+				tmp_ht->nNextFreeElement = original_ht->nNextFreeElement;
 			}
 			break;
 		case IS_CONSTANT_AST:
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h
index 30f170bfb..9dbcc3b80 100644
--- a/Zend/zend_variables.h
+++ b/Zend/zend_variables.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        | 
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index ab3d0d7c4..978b5dc55 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h
index b0df0ad31..160381517 100644
--- a/Zend/zend_virtual_cwd.h
+++ b/Zend/zend_virtual_cwd.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2014 The PHP Group                                |
+   | Copyright (c) 1997-2015 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h
index 078be15b7..15a269e0a 100644
--- a/Zend/zend_vm.h
+++ b/Zend/zend_vm.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -21,9 +21,13 @@
 #ifndef ZEND_VM_H
 #define ZEND_VM_H
 
+BEGIN_EXTERN_C()
+
 ZEND_API void zend_vm_use_old_executor(void);
 ZEND_API void zend_vm_set_opcode_handler(zend_op* opcode);
 
+END_EXTERN_C()
+
 #define ZEND_VM_SET_OPCODE_HANDLER(opline) zend_vm_set_opcode_handler(opline)
 
 #endif
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 705e46e7d..a2c0b1e4e 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -1961,7 +1961,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 			void **p = EX(function_state).arguments - num_args;
 
 			for (i = 0; i < num_args; ++i, ++p) {
-				zend_verify_arg_type(fbc, i + 1, (zval *) *p, 0 TSRMLS_CC);
+				zend_verify_arg_type(fbc, i + 1, (zval *) *p, 0, NULL TSRMLS_CC);
 			}
 		}
 
@@ -3374,7 +3374,7 @@ ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY)
 
 	SAVE_OPLINE();
 	if (UNEXPECTED(param == NULL)) {
-		if (zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL, opline->extended_value TSRMLS_CC)) {
+		if (zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL, opline->extended_value, NULL TSRMLS_CC)) {
 			const char *space;
 			const char *class_name;
 			zend_execute_data *ptr;
@@ -3396,7 +3396,7 @@ ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY)
 	} else {
 		zval **var_ptr;
 
-		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value TSRMLS_CC);
+		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value, NULL TSRMLS_CC);
 		var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
 		Z_DELREF_PP(var_ptr);
 		*var_ptr = *param;
@@ -3438,7 +3438,7 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST)
 		Z_ADDREF_P(assignment_value);
 	}
 
-	zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC);
+	zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value, opline->op2.zv TSRMLS_CC);
 	var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
 	zval_ptr_dtor(var_ptr);
 	*var_ptr = assignment_value;
@@ -3469,7 +3469,7 @@ ZEND_VM_HANDLER(164, ZEND_RECV_VARIADIC, ANY, ANY)
 
 	for (; arg_num <= arg_count; ++arg_num) {
 		zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
-		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value TSRMLS_CC);
+		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value, NULL TSRMLS_CC);
 		zend_hash_next_index_insert(Z_ARRVAL_P(params), param, sizeof(zval *), NULL);
 		Z_ADDREF_PP(param);
 	}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 993aaee74..d7db05907 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -541,7 +541,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 			void **p = EX(function_state).arguments - num_args;
 
 			for (i = 0; i < num_args; ++i, ++p) {
-				zend_verify_arg_type(fbc, i + 1, (zval *) *p, 0 TSRMLS_CC);
+				zend_verify_arg_type(fbc, i + 1, (zval *) *p, 0, NULL TSRMLS_CC);
 			}
 		}
 
@@ -861,7 +861,7 @@ static int ZEND_FASTCALL  ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 	SAVE_OPLINE();
 	if (UNEXPECTED(param == NULL)) {
-		if (zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL, opline->extended_value TSRMLS_CC)) {
+		if (zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL, opline->extended_value, NULL TSRMLS_CC)) {
 			const char *space;
 			const char *class_name;
 			zend_execute_data *ptr;
@@ -883,7 +883,7 @@ static int ZEND_FASTCALL  ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	} else {
 		zval **var_ptr;
 
-		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value TSRMLS_CC);
+		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value, NULL TSRMLS_CC);
 		var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
 		Z_DELREF_PP(var_ptr);
 		*var_ptr = *param;
@@ -916,7 +916,7 @@ static int ZEND_FASTCALL  ZEND_RECV_VARIADIC_SPEC_HANDLER(ZEND_OPCODE_HANDLER_AR
 
 	for (; arg_num <= arg_count; ++arg_num) {
 		zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
-		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value TSRMLS_CC);
+		zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value, NULL TSRMLS_CC);
 		zend_hash_next_index_insert(Z_ARRVAL_P(params), param, sizeof(zval *), NULL);
 		Z_ADDREF_PP(param);
 	}
@@ -1643,7 +1643,7 @@ static int ZEND_FASTCALL  ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 		Z_ADDREF_P(assignment_value);
 	}
 
-	zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC);
+	zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value, opline->op2.zv TSRMLS_CC);
 	var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
 	zval_ptr_dtor(var_ptr);
 	*var_ptr = assignment_value;
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 9995b0b9a..0834b7867 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -3,7 +3,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -24,7 +24,7 @@ $header_text = <<< DATA
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -1208,7 +1208,9 @@ function gen_vm($def, $skel) {
 	out($f, $GLOBALS['header_text']);
 
 	fputs($f, "#ifndef ZEND_VM_OPCODES_H\n#define ZEND_VM_OPCODES_H\n\n");
+	fputs($f, "BEGIN_EXTERN_C()\n\n");
 	fputs($f, "ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);\n\n");
+	fputs($f, "END_EXTERN_C()\n\n");
 	
 	foreach ($opcodes as $code => $dsc) {
 		$code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT);
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index 23edabc47..6fb93d4f1 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
index f9c30ca12..76b5f4c6e 100644
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -21,8 +21,12 @@
 #ifndef ZEND_VM_OPCODES_H
 #define ZEND_VM_OPCODES_H
 
+BEGIN_EXTERN_C()
+
 ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);
 
+END_EXTERN_C()
+
 #define ZEND_NOP                               0
 #define ZEND_ADD                               1
 #define ZEND_SUB                               2