]> granicus.if.org Git - php/commitdiff
regenerate with re2c 1.0.3
authorXinchen Hui <laruence@gmail.com>
Mon, 11 Feb 2019 07:42:55 +0000 (15:42 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 11 Feb 2019 07:42:55 +0000 (15:42 +0800)
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

index f33889f323cbecb3ee41aa1df23fec9537fee75b..e57a28570b9e7047da2f68f450c25e8dc65253f8 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 */
+/* Generated by re2c 1.0.3 */
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -67,6 +67,7 @@
 /* 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
@@ -382,7 +383,7 @@ restart:
                }
        }
 
-#line 386 "Zend/zend_ini_scanner.c"
+#line 387 "Zend/zend_ini_scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -514,7 +515,7 @@ yy5:
 
        RETURN_TOKEN(TC_LABEL, yytext, yyleng);
 }
-#line 518 "Zend/zend_ini_scanner.c"
+#line 519 "Zend/zend_ini_scanner.c"
 yy6:
                YYDEBUG(6, *YYCURSOR);
                ++YYCURSOR;
@@ -530,7 +531,7 @@ yy6:
                        if (yych >= '\r') goto yy11;
                } else {
                        if (yych <= ';') {
-                               if (yych >= ';') goto yy31;
+                               if (yych >= ';') goto yy16;
                        } else {
                                if (yych == '=') goto yy18;
                        }
@@ -543,7 +544,7 @@ yy8:
        /* eat whitespace */
        goto restart;
 }
-#line 547 "Zend/zend_ini_scanner.c"
+#line 548 "Zend/zend_ini_scanner.c"
 yy9:
                YYDEBUG(9, *YYCURSOR);
                ++YYCURSOR;
@@ -555,7 +556,7 @@ yy10:
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 559 "Zend/zend_ini_scanner.c"
+#line 560 "Zend/zend_ini_scanner.c"
 yy11:
                YYDEBUG(11, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -594,7 +595,7 @@ yy12:
                                if (yych <= ';') {
                                        if (yych <= ')') goto yy5;
                                        if (yych <= ':') goto yy3;
-                                       goto yy31;
+                                       goto yy16;
                                } else {
                                        if (yych == '=') goto yy18;
                                        goto yy3;
@@ -620,19 +621,18 @@ yy14:
                { /* Disallow these chars outside option values */
        return yytext[0];
 }
-#line 624 "Zend/zend_ini_scanner.c"
+#line 625 "Zend/zend_ini_scanner.c"
 yy16:
                YYDEBUG(16, *YYCURSOR);
                ++YYCURSOR;
+               YYFILL(2);
                yych = *YYCURSOR;
-               goto yy32;
                YYDEBUG(17, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 656 "Zend/zend_ini_scanner.l"
-               {
-       return 0;
-}
-#line 636 "Zend/zend_ini_scanner.c"
+               if (yybm[0+yych] & 128) {
+                       goto yy16;
+               }
+               if (yych <= '\n') goto yy31;
+               goto yy33;
 yy18:
                YYDEBUG(18, *YYCURSOR);
                ++YYCURSOR;
@@ -656,22 +656,22 @@ yy18:
 yy21:
                YYDEBUG(21, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'A') goto yy36;
-               if (yych == 'a') goto yy36;
+               if (yych == 'A') goto yy34;
+               if (yych == 'a') goto yy34;
                goto yy4;
 yy22:
                YYDEBUG(22, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'U') {
-                       if (yych == 'O') goto yy37;
+                       if (yych == 'O') goto yy35;
                        if (yych <= 'T') goto yy4;
-                       goto yy39;
+                       goto yy37;
                } else {
                        if (yych <= 'o') {
                                if (yych <= 'n') goto yy4;
-                               goto yy37;
+                               goto yy35;
                        } else {
-                               if (yych == 'u') goto yy39;
+                               if (yych == 'u') goto yy37;
                                goto yy4;
                        }
                }
@@ -679,29 +679,29 @@ yy23:
                YYDEBUG(23, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= 'N') {
-                       if (yych == 'F') goto yy40;
+                       if (yych == 'F') goto yy38;
                        if (yych <= 'M') goto yy4;
-                       goto yy41;
+                       goto yy39;
                } else {
                        if (yych <= 'f') {
                                if (yych <= 'e') goto yy4;
-                               goto yy40;
+                               goto yy38;
                        } else {
-                               if (yych == 'n') goto yy41;
+                               if (yych == 'n') goto yy39;
                                goto yy4;
                        }
                }
 yy24:
                YYDEBUG(24, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'R') goto yy44;
-               if (yych == 'r') goto yy44;
+               if (yych == 'R') goto yy42;
+               if (yych == 'r') goto yy42;
                goto yy4;
 yy25:
                YYDEBUG(25, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy45;
-               if (yych == 'e') goto yy45;
+               if (yych == 'E') goto yy43;
+               if (yych == 'e') goto yy43;
                goto yy4;
 yy26:
                YYDEBUG(26, *YYCURSOR);
@@ -746,19 +746,8 @@ yy28:
 yy31:
                YYDEBUG(31, *YYCURSOR);
                ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
 yy32:
                YYDEBUG(32, *YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy31;
-               }
-               if (yych >= '\v') goto yy35;
-yy33:
-               YYDEBUG(33, *YYCURSOR);
-               ++YYCURSOR;
-yy34:
-               YYDEBUG(34, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 645 "Zend/zend_ini_scanner.l"
                { /* Comment */
@@ -766,32 +755,32 @@ yy34:
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 770 "Zend/zend_ini_scanner.c"
-yy35:
-               YYDEBUG(35, *YYCURSOR);
+#line 759 "Zend/zend_ini_scanner.c"
+yy33:
+               YYDEBUG(33, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy33;
-               goto yy34;
-yy36:
-               YYDEBUG(36, *YYCURSOR);
+               if (yych == '\n') goto yy31;
+               goto yy32;
+yy34:
+               YYDEBUG(34, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy46;
-               if (yych == 'l') goto yy46;
+               if (yych == 'L') goto yy44;
+               if (yych == 'l') goto yy44;
                goto yy4;
-yy37:
-               YYDEBUG(37, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) <= '\'') {
+yy35:
+               YYDEBUG(35, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych <= '\'') {
                        if (yych <= 0x1F) {
                                if (yych <= '\n') {
                                        if (yych <= 0x08) goto yy4;
-                                       if (yych <= '\t') goto yy47;
+                                       if (yych <= '\t') goto yy45;
                                } else {
                                        if (yych != '\r') goto yy4;
                                }
                        } else {
                                if (yych <= '#') {
-                                       if (yych <= ' ') goto yy49;
+                                       if (yych <= ' ') goto yy47;
                                        if (yych >= '#') goto yy4;
                                } else {
                                        if (yych == '%') goto yy4;
@@ -801,60 +790,60 @@ yy37:
                } else {
                        if (yych <= 'N') {
                                if (yych <= ';') {
-                                       if (yych <= ')') goto yy38;
+                                       if (yych <= ')') goto yy36;
                                        if (yych <= ':') goto yy4;
                                } else {
-                                       if (yych == '=') goto yy38;
+                                       if (yych == '=') goto yy36;
                                        if (yych <= 'M') goto yy4;
-                                       goto yy51;
+                                       goto yy49;
                                }
                        } else {
                                if (yych <= 'm') {
                                        if (yych != '^') goto yy4;
                                } else {
-                                       if (yych <= 'n') goto yy51;
+                                       if (yych <= 'n') goto yy49;
                                        if (yych <= 'z') goto yy4;
                                        if (yych >= 0x7F) goto yy4;
                                }
                        }
                }
-yy38:
-               YYDEBUG(38, *YYCURSOR);
+yy36:
+               YYDEBUG(36, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 474 "Zend/zend_ini_scanner.l"
                { /* FALSE value (when used outside option value/offset this causes parse error!)*/
        RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-#line 829 "Zend/zend_ini_scanner.c"
-yy39:
-               YYDEBUG(39, *YYCURSOR);
+#line 818 "Zend/zend_ini_scanner.c"
+yy37:
+               YYDEBUG(37, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy52;
-               if (yych == 'l') goto yy52;
+               if (yych == 'L') goto yy50;
+               if (yych == 'l') goto yy50;
                goto yy4;
-yy40:
-               YYDEBUG(40, *YYCURSOR);
+yy38:
+               YYDEBUG(38, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'F') goto yy49;
-               if (yych == 'f') goto yy49;
+               if (yych == 'F') goto yy47;
+               if (yych == 'f') goto yy47;
                goto yy4;
-yy41:
-               YYDEBUG(41, *YYCURSOR);
+yy39:
+               YYDEBUG(39, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(42, *YYCURSOR);
+               YYDEBUG(40, *YYCURSOR);
                if (yych <= '&') {
                        if (yych <= 0x1F) {
                                if (yych <= '\n') {
                                        if (yych <= 0x08) goto yy3;
-                                       if (yych <= '\t') goto yy53;
+                                       if (yych <= '\t') goto yy51;
                                } else {
                                        if (yych != '\r') goto yy3;
                                }
                        } else {
                                if (yych <= '#') {
-                                       if (yych <= ' ') goto yy41;
+                                       if (yych <= ' ') goto yy39;
                                        if (yych >= '#') goto yy3;
                                } else {
                                        if (yych == '%') goto yy3;
@@ -873,139 +862,139 @@ yy41:
                                        if (yych == '[') goto yy28;
                                        goto yy3;
                                } else {
-                                       if (yych <= '^') goto yy43;
+                                       if (yych <= '^') goto yy41;
                                        if (yych <= 'z') goto yy3;
                                        if (yych >= 0x7F) goto yy3;
                                }
                        }
                }
-yy43:
-               YYDEBUG(43, *YYCURSOR);
+yy41:
+               YYDEBUG(41, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 470 "Zend/zend_ini_scanner.l"
                { /* TRUE value (when used outside option value/offset this causes parse error!) */
        RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-#line 890 "Zend/zend_ini_scanner.c"
+#line 879 "Zend/zend_ini_scanner.c"
+yy42:
+               YYDEBUG(42, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'U') goto yy53;
+               if (yych == 'u') goto yy53;
+               goto yy4;
+yy43:
+               YYDEBUG(43, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == 'S') goto yy39;
+               if (yych == 's') goto yy39;
+               goto yy4;
 yy44:
                YYDEBUG(44, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'U') goto yy55;
-               if (yych == 'u') goto yy55;
+               if (yych == 'S') goto yy49;
+               if (yych == 's') goto yy49;
                goto yy4;
 yy45:
                YYDEBUG(45, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy41;
-               if (yych == 's') goto yy41;
-               goto yy4;
-yy46:
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
                YYDEBUG(46, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == 'S') goto yy51;
-               if (yych == 's') goto yy51;
-               goto yy4;
+               if (yych == '\t') goto yy45;
+               if (yych == ' ') goto yy45;
+               goto yy36;
 yy47:
                YYDEBUG(47, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                YYDEBUG(48, *YYCURSOR);
-               if (yych == '\t') goto yy47;
-               if (yych == ' ') goto yy47;
-               goto yy38;
-yy49:
-               YYDEBUG(49, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(50, *YYCURSOR);
                if (yych <= '&') {
                        if (yych <= 0x1F) {
                                if (yych <= '\n') {
                                        if (yych <= 0x08) goto yy3;
-                                       if (yych <= '\t') goto yy47;
-                                       goto yy38;
+                                       if (yych <= '\t') goto yy45;
+                                       goto yy36;
                                } else {
-                                       if (yych == '\r') goto yy38;
+                                       if (yych == '\r') goto yy36;
                                        goto yy3;
                                }
                        } else {
                                if (yych <= '#') {
-                                       if (yych <= ' ') goto yy49;
-                                       if (yych <= '"') goto yy38;
+                                       if (yych <= ' ') goto yy47;
+                                       if (yych <= '"') goto yy36;
                                        goto yy3;
                                } else {
                                        if (yych == '%') goto yy3;
-                                       goto yy38;
+                                       goto yy36;
                                }
                        }
                } else {
                        if (yych <= '=') {
                                if (yych <= ':') {
                                        if (yych <= '\'') goto yy3;
-                                       if (yych <= ')') goto yy38;
+                                       if (yych <= ')') goto yy36;
                                        goto yy3;
                                } else {
                                        if (yych == '<') goto yy3;
-                                       goto yy38;
+                                       goto yy36;
                                }
                        } else {
                                if (yych <= ']') {
                                        if (yych == '[') goto yy28;
                                        goto yy3;
                                } else {
-                                       if (yych <= '^') goto yy38;
+                                       if (yych <= '^') goto yy36;
                                        if (yych <= 'z') goto yy3;
-                                       if (yych <= '~') goto yy38;
+                                       if (yych <= '~') goto yy36;
                                        goto yy3;
                                }
                        }
                }
-yy51:
-               YYDEBUG(51, *YYCURSOR);
+yy49:
+               YYDEBUG(49, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy49;
-               if (yych == 'e') goto yy49;
+               if (yych == 'E') goto yy47;
+               if (yych == 'e') goto yy47;
                goto yy4;
-yy52:
-               YYDEBUG(52, *YYCURSOR);
+yy50:
+               YYDEBUG(50, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'L') goto yy56;
-               if (yych == 'l') goto yy56;
+               if (yych == 'L') goto yy54;
+               if (yych == 'l') goto yy54;
                goto yy4;
-yy53:
-               YYDEBUG(53, *YYCURSOR);
+yy51:
+               YYDEBUG(51, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(54, *YYCURSOR);
-               if (yych == '\t') goto yy53;
-               if (yych == ' ') goto yy53;
-               goto yy43;
-yy55:
-               YYDEBUG(55, *YYCURSOR);
+               YYDEBUG(52, *YYCURSOR);
+               if (yych == '\t') goto yy51;
+               if (yych == ' ') goto yy51;
+               goto yy41;
+yy53:
+               YYDEBUG(53, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == 'E') goto yy41;
-               if (yych == 'e') goto yy41;
+               if (yych == 'E') goto yy39;
+               if (yych == 'e') goto yy39;
                goto yy4;
-yy56:
-               YYDEBUG(56, *YYCURSOR);
+yy54:
+               YYDEBUG(54, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(57, *YYCURSOR);
+               YYDEBUG(55, *YYCURSOR);
                if (yych <= '&') {
                        if (yych <= 0x1F) {
                                if (yych <= '\n') {
                                        if (yych <= 0x08) goto yy3;
-                                       if (yych <= '\t') goto yy59;
+                                       if (yych <= '\t') goto yy57;
                                } else {
                                        if (yych != '\r') goto yy3;
                                }
                        } else {
                                if (yych <= '#') {
-                                       if (yych <= ' ') goto yy56;
+                                       if (yych <= ' ') goto yy54;
                                        if (yych >= '#') goto yy3;
                                } else {
                                        if (yych == '%') goto yy3;
@@ -1024,145 +1013,29 @@ yy56:
                                        if (yych == '[') goto yy28;
                                        goto yy3;
                                } else {
-                                       if (yych <= '^') goto yy58;
+                                       if (yych <= '^') goto yy56;
                                        if (yych <= 'z') goto yy3;
                                        if (yych >= 0x7F) goto yy3;
                                }
                        }
                }
-yy58:
-               YYDEBUG(58, *YYCURSOR);
+yy56:
+               YYDEBUG(56, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 478 "Zend/zend_ini_scanner.l"
                {
        RETURN_TOKEN(NULL_NULL, "", 0);
 }
-#line 1041 "Zend/zend_ini_scanner.c"
-yy59:
-               YYDEBUG(59, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(60, *YYCURSOR);
-               if (yych == '\t') goto yy59;
-               if (yych == ' ') goto yy59;
-               goto yy58;
-       }
-/* *********************************** */
-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(61, *YYCURSOR);
-               YYFILL(2);
-               yych = *YYCURSOR;
-               if (yych == '"') goto yy65;
-               if (yych == '$') goto yy68;
-               YYDEBUG(63, *YYCURSOR);
-               ++YYCURSOR;
-yy64:
-               YYDEBUG(64, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 595 "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, '"');
-       return TC_QUOTED_STRING;
-}
-#line 1135 "Zend/zend_ini_scanner.c"
-yy65:
-               YYDEBUG(65, *YYCURSOR);
+#line 1030 "Zend/zend_ini_scanner.c"
+yy57:
+               YYDEBUG(57, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(66, *YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy65;
-               }
-               YYDEBUG(67, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 590 "Zend/zend_ini_scanner.l"
-               { /* Double quoted '"' string ends */
-       yy_pop_state();
-       return '"';
-}
-#line 1152 "Zend/zend_ini_scanner.c"
-yy68:
-               YYDEBUG(68, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych != '{') goto yy64;
-               YYDEBUG(69, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(70, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 450 "Zend/zend_ini_scanner.l"
-               { /* Variable start */
-       yy_push_state(ST_VARNAME);
-       return TC_DOLLAR_CURLY;
-}
-#line 1166 "Zend/zend_ini_scanner.c"
+               YYDEBUG(58, *YYCURSOR);
+               if (yych == '\t') goto yy57;
+               if (yych == ' ') goto yy57;
+               goto yy56;
        }
 /* *********************************** */
 yyc_ST_OFFSET:
@@ -1201,356 +1074,347 @@ yyc_ST_OFFSET:
                        132, 132, 132, 132, 132, 132, 132, 132, 
                        132, 132, 132, 132, 132, 132, 132, 132, 
                };
-               YYDEBUG(71, *YYCURSOR);
+               YYDEBUG(59, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 8) {
-                       goto yy76;
+                       goto yy64;
                }
                if (yych <= '/') {
                        if (yych <= '"') {
                                if (yych <= '\f') {
-                                       if (yych <= 0x08) goto yy73;
-                                       if (yych <= '\n') goto yy78;
+                                       if (yych <= 0x08) goto yy61;
+                                       if (yych <= '\n') goto yy66;
                                } else {
-                                       if (yych <= '\r') goto yy78;
-                                       if (yych >= '"') goto yy80;
+                                       if (yych <= '\r') goto yy66;
+                                       if (yych >= '"') goto yy68;
                                }
                        } else {
                                if (yych <= '&') {
-                                       if (yych == '$') goto yy82;
+                                       if (yych == '$') goto yy70;
                                } else {
-                                       if (yych <= '\'') goto yy83;
-                                       if (yych <= ',') goto yy73;
-                                       if (yych <= '.') goto yy84;
+                                       if (yych <= '\'') goto yy71;
+                                       if (yych <= ',') goto yy61;
+                                       if (yych <= '.') goto yy72;
                                }
                        }
                } else {
                        if (yych <= '[') {
                                if (yych <= ';') {
-                                       if (yych <= '9') goto yy85;
-                                       if (yych >= ';') goto yy78;
+                                       if (yych <= '9') goto yy73;
+                                       if (yych >= ';') goto yy66;
                                } else {
-                                       if (yych <= '@') goto yy73;
-                                       if (yych <= 'Z') goto yy88;
+                                       if (yych <= '@') goto yy61;
+                                       if (yych <= 'Z') goto yy76;
                                }
                        } else {
                                if (yych <= '^') {
-                                       if (yych <= '\\') goto yy91;
-                                       if (yych <= ']') goto yy92;
+                                       if (yych <= '\\') goto yy79;
+                                       if (yych <= ']') goto yy80;
                                } else {
-                                       if (yych == '`') goto yy73;
-                                       if (yych <= 'z') goto yy88;
+                                       if (yych == '`') goto yy61;
+                                       if (yych <= 'z') goto yy76;
                                }
                        }
                }
-yy73:
-               YYDEBUG(73, *YYCURSOR);
+yy61:
+               YYDEBUG(61, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy74:
-               YYDEBUG(74, *YYCURSOR);
+yy62:
+               YYDEBUG(62, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy73;
+                       goto yy61;
                }
-               if (yych <= '"') goto yy75;
-               if (yych <= '$') goto yy94;
-               if (yych <= ';') goto yy75;
-               if (yych <= '\\') goto yy96;
-yy75:
-               YYDEBUG(75, *YYCURSOR);
+               if (yych <= '"') goto yy63;
+               if (yych <= '$') goto yy82;
+               if (yych <= ';') goto yy63;
+               if (yych <= '\\') goto yy79;
+yy63:
+               YYDEBUG(63, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 581 "Zend/zend_ini_scanner.l"
                { /* Get rest as section/offset value */
        RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 1270 "Zend/zend_ini_scanner.c"
-yy76:
-               YYDEBUG(76, *YYCURSOR);
+#line 1143 "Zend/zend_ini_scanner.c"
+yy64:
+               YYDEBUG(64, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(77, *YYCURSOR);
+               YYDEBUG(65, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy76;
+                       goto yy64;
                }
                if (yych <= '$') {
                        if (yych <= '\r') {
-                               if (yych <= 0x08) goto yy73;
-                               if (yych <= '\n') goto yy75;
-                               if (yych <= '\f') goto yy73;
-                               goto yy75;
+                               if (yych <= 0x08) goto yy61;
+                               if (yych <= '\n') goto yy63;
+                               if (yych <= '\f') goto yy61;
+                               goto yy63;
                        } else {
-                               if (yych == '"') goto yy80;
-                               if (yych <= '#') goto yy73;
-                               goto yy94;
+                               if (yych == '"') goto yy68;
+                               if (yych <= '#') goto yy61;
+                               goto yy82;
                        }
                } else {
                        if (yych <= ';') {
-                               if (yych == '\'') goto yy75;
-                               if (yych <= ':') goto yy73;
-                               goto yy75;
+                               if (yych == '\'') goto yy63;
+                               if (yych <= ':') goto yy61;
+                               goto yy63;
                        } else {
-                               if (yych <= '[') goto yy73;
-                               if (yych <= '\\') goto yy96;
-                               if (yych <= ']') goto yy92;
-                               goto yy73;
+                               if (yych <= '[') goto yy61;
+                               if (yych <= '\\') goto yy79;
+                               if (yych <= ']') goto yy80;
+                               goto yy61;
                        }
                }
-yy78:
-               YYDEBUG(78, *YYCURSOR);
+yy66:
+               YYDEBUG(66, *YYCURSOR);
                ++YYCURSOR;
-yy79:
-               YYDEBUG(79, *YYCURSOR);
+yy67:
+               YYDEBUG(67, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 656 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 1314 "Zend/zend_ini_scanner.c"
-yy80:
-               YYDEBUG(80, *YYCURSOR);
+#line 1187 "Zend/zend_ini_scanner.c"
+yy68:
+               YYDEBUG(68, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(81, *YYCURSOR);
+               YYDEBUG(69, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 585 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string start */
        yy_push_state(ST_DOUBLE_QUOTES);
        return '"';
 }
-#line 1325 "Zend/zend_ini_scanner.c"
-yy82:
-               YYDEBUG(82, *YYCURSOR);
+#line 1198 "Zend/zend_ini_scanner.c"
+yy70:
+               YYDEBUG(70, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '\\') {
-                       if (yych <= 0x00) goto yy79;
-                       if (yych <= '[') goto yy73;
-                       goto yy97;
+                       if (yych <= 0x00) goto yy67;
+                       if (yych <= '[') goto yy61;
+                       goto yy84;
                } else {
-                       if (yych == '{') goto yy99;
-                       goto yy73;
+                       if (yych == '{') goto yy86;
+                       goto yy61;
                }
-yy83:
-               YYDEBUG(83, *YYCURSOR);
-               yyaccept = 1;
-               yych = *(YYMARKER = ++YYCURSOR);
+yy71:
+               YYDEBUG(71, *YYCURSOR);
+               yych = *++YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy101;
+                       goto yy88;
                }
-               goto yy79;
-yy84:
-               YYDEBUG(84, *YYCURSOR);
+               goto yy67;
+yy72:
+               YYDEBUG(72, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych <= '/') goto yy74;
-               if (yych <= '9') goto yy103;
-               goto yy74;
-yy85:
-               YYDEBUG(85, *YYCURSOR);
-               yyaccept = 2;
+               if (yych <= '/') goto yy62;
+               if (yych <= '9') goto yy90;
+               goto yy62;
+yy73:
+               YYDEBUG(73, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(86, *YYCURSOR);
+               YYDEBUG(74, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy85;
+                       goto yy73;
                }
                if (yych <= '&') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy87;
-                               if (yych <= '\f') goto yy73;
+                               if (yych == '\n') goto yy75;
+                               if (yych <= '\f') goto yy61;
                        } else {
                                if (yych <= '"') {
-                                       if (yych <= '!') goto yy73;
+                                       if (yych <= '!') goto yy61;
                                } else {
-                                       if (yych == '$') goto yy94;
-                                       goto yy73;
+                                       if (yych == '$') goto yy82;
+                                       goto yy61;
                                }
                        }
                } else {
                        if (yych <= ':') {
-                               if (yych <= '\'') goto yy87;
-                               if (yych == '.') goto yy103;
-                               goto yy73;
+                               if (yych <= '\'') goto yy75;
+                               if (yych == '.') goto yy90;
+                               goto yy61;
                        } else {
                                if (yych <= '[') {
-                                       if (yych >= '<') goto yy73;
+                                       if (yych >= '<') goto yy61;
                                } else {
-                                       if (yych <= '\\') goto yy96;
-                                       if (yych >= '^') goto yy73;
+                                       if (yych <= '\\') goto yy79;
+                                       if (yych >= '^') goto yy61;
                                }
                        }
                }
-yy87:
-               YYDEBUG(87, *YYCURSOR);
+yy75:
+               YYDEBUG(75, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 559 "Zend/zend_ini_scanner.l"
                { /* Get number option value as string */
        RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 1395 "Zend/zend_ini_scanner.c"
-yy88:
-               YYDEBUG(88, *YYCURSOR);
-               yyaccept = 3;
+#line 1267 "Zend/zend_ini_scanner.c"
+yy76:
+               YYDEBUG(76, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(89, *YYCURSOR);
+               YYDEBUG(77, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy88;
+                       goto yy76;
                }
                if (yych <= '$') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy90;
-                               if (yych <= '\f') goto yy73;
+                               if (yych == '\n') goto yy78;
+                               if (yych <= '\f') goto yy61;
                        } else {
-                               if (yych == '"') goto yy90;
-                               if (yych <= '#') goto yy73;
-                               goto yy94;
+                               if (yych == '"') goto yy78;
+                               if (yych <= '#') goto yy61;
+                               goto yy82;
                        }
                } else {
                        if (yych <= ';') {
-                               if (yych == '\'') goto yy90;
-                               if (yych <= ':') goto yy73;
+                               if (yych == '\'') goto yy78;
+                               if (yych <= ':') goto yy61;
                        } else {
-                               if (yych <= '[') goto yy73;
-                               if (yych <= '\\') goto yy96;
-                               if (yych >= '^') goto yy73;
+                               if (yych <= '[') goto yy61;
+                               if (yych <= '\\') goto yy79;
+                               if (yych >= '^') goto yy61;
                        }
                }
-yy90:
-               YYDEBUG(90, *YYCURSOR);
+yy78:
+               YYDEBUG(78, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 555 "Zend/zend_ini_scanner.l"
                { /* Get constant option value */
        RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 1432 "Zend/zend_ini_scanner.c"
-yy91:
-               YYDEBUG(91, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy73;
-yy92:
-               YYDEBUG(92, *YYCURSOR);
+#line 1304 "Zend/zend_ini_scanner.c"
+yy79:
+               YYDEBUG(79, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(93, *YYCURSOR);
+               YYFILL(1);
+               yych = *YYCURSOR;
+               goto yy61;
+yy80:
+               YYDEBUG(80, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(81, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 445 "Zend/zend_ini_scanner.l"
                { /* End of section or an option offset */
        BEGIN(INITIAL);
        return ']';
 }
-#line 1447 "Zend/zend_ini_scanner.c"
-yy94:
-               YYDEBUG(94, *YYCURSOR);
+#line 1321 "Zend/zend_ini_scanner.c"
+yy82:
+               YYDEBUG(82, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yych <= '\\') {
-                       if (yych <= 0x00) goto yy95;
-                       if (yych <= '[') goto yy73;
-                       goto yy97;
+                       if (yych <= 0x00) goto yy83;
+                       if (yych <= '[') goto yy61;
+                       goto yy84;
                } else {
-                       if (yych != '{') goto yy73;
+                       if (yych != '{') goto yy61;
                }
-yy95:
-               YYDEBUG(95, *YYCURSOR);
+yy83:
+               YYDEBUG(83, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 1) {
                        if (yyaccept == 0) {
-                               goto yy75;
+                               goto yy63;
                        } else {
-                               goto yy79;
+                               goto yy75;
                        }
                } else {
-                       if (yyaccept == 2) {
-                               goto yy87;
-                       } else {
-                               goto yy90;
-                       }
+                       goto yy78;
                }
-yy96:
-               YYDEBUG(96, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               goto yy73;
-yy97:
-               YYDEBUG(97, *YYCURSOR);
+yy84:
+               YYDEBUG(84, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(98, *YYCURSOR);
+               YYDEBUG(85, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy97;
+                       goto yy84;
                }
-               goto yy73;
-yy99:
-               YYDEBUG(99, *YYCURSOR);
+               goto yy61;
+yy86:
+               YYDEBUG(86, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(100, *YYCURSOR);
+               YYDEBUG(87, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 450 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME);
        return TC_DOLLAR_CURLY;
 }
-#line 1502 "Zend/zend_ini_scanner.c"
-yy101:
-               YYDEBUG(101, *YYCURSOR);
+#line 1366 "Zend/zend_ini_scanner.c"
+yy88:
+               YYDEBUG(88, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(102, *YYCURSOR);
+               YYDEBUG(89, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy101;
+                       goto yy88;
                }
-               goto yy105;
-yy103:
-               YYDEBUG(103, *YYCURSOR);
-               yyaccept = 2;
+               goto yy92;
+yy90:
+               YYDEBUG(90, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(104, *YYCURSOR);
+               YYDEBUG(91, *YYCURSOR);
                if (yych <= '&') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy87;
-                               if (yych <= '\f') goto yy73;
-                               goto yy87;
+                               if (yych == '\n') goto yy75;
+                               if (yych <= '\f') goto yy61;
+                               goto yy75;
                        } else {
                                if (yych <= '"') {
-                                       if (yych <= '!') goto yy73;
-                                       goto yy87;
+                                       if (yych <= '!') goto yy61;
+                                       goto yy75;
                                } else {
-                                       if (yych == '$') goto yy94;
-                                       goto yy73;
+                                       if (yych == '$') goto yy82;
+                                       goto yy61;
                                }
                        }
                } else {
                        if (yych <= ':') {
-                               if (yych <= '\'') goto yy87;
-                               if (yych <= '/') goto yy73;
-                               if (yych <= '9') goto yy103;
-                               goto yy73;
+                               if (yych <= '\'') goto yy75;
+                               if (yych <= '/') goto yy61;
+                               if (yych <= '9') goto yy90;
+                               goto yy61;
                        } else {
                                if (yych <= '[') {
-                                       if (yych <= ';') goto yy87;
-                                       goto yy73;
+                                       if (yych <= ';') goto yy75;
+                                       goto yy61;
                                } else {
-                                       if (yych <= '\\') goto yy96;
-                                       if (yych <= ']') goto yy87;
-                                       goto yy73;
+                                       if (yych <= '\\') goto yy79;
+                                       if (yych <= ']') goto yy75;
+                                       goto yy61;
                                }
                        }
                }
-yy105:
-               YYDEBUG(105, *YYCURSOR);
+yy92:
+               YYDEBUG(92, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(106, *YYCURSOR);
+               YYDEBUG(93, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 417 "Zend/zend_ini_scanner.l"
                { /* Raw string */
@@ -1561,610 +1425,294 @@ yy105:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1565 "Zend/zend_ini_scanner.c"
+#line 1429 "Zend/zend_ini_scanner.c"
        }
 /* *********************************** */
-yyc_ST_RAW:
+yyc_ST_SECTION_VALUE:
        {
                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, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
-                       128, 128, 128, 128, 128, 128, 128, 128
+                       132, 132, 132, 132, 132, 132, 132, 132
+                       132, 140, 128, 132, 132, 128, 132, 132
+                       132, 132, 132, 132, 132, 132, 132, 132
+                       132, 132, 132, 132, 132, 132, 132, 132
+                       140, 132, 128, 132, 192, 132, 132,   0
+                       132, 132, 132, 132, 132, 132, 132, 132
+                       180, 180, 180, 180, 180, 180, 180, 180
+                       180, 180, 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, 192, 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(107, *YYCURSOR);
-               YYFILL(3);
+               YYDEBUG(94, *YYCURSOR);
+               YYFILL(2);
                yych = *YYCURSOR;
-               if (yych <= '\f') {
-                       if (yych <= 0x08) {
-                               if (yych >= 0x01) goto yy111;
+               if (yybm[0+yych] & 8) {
+                       goto yy99;
+               }
+               if (yych <= '/') {
+                       if (yych <= '"') {
+                               if (yych <= '\f') {
+                                       if (yych <= 0x08) goto yy96;
+                                       if (yych <= '\n') goto yy101;
+                               } else {
+                                       if (yych <= '\r') goto yy101;
+                                       if (yych >= '"') goto yy103;
+                               }
                        } else {
-                               if (yych <= '\t') goto yy113;
-                               if (yych <= '\n') goto yy114;
-                               goto yy111;
+                               if (yych <= '&') {
+                                       if (yych == '$') goto yy105;
+                               } else {
+                                       if (yych <= '\'') goto yy106;
+                                       if (yych <= ',') goto yy96;
+                                       if (yych <= '.') goto yy107;
+                               }
                        }
                } else {
-                       if (yych <= ' ') {
-                               if (yych <= '\r') goto yy116;
-                               if (yych <= 0x1F) goto yy111;
-                               goto yy113;
+                       if (yych <= '[') {
+                               if (yych <= ';') {
+                                       if (yych <= '9') goto yy108;
+                                       if (yych >= ';') goto yy101;
+                               } else {
+                                       if (yych <= '@') goto yy96;
+                                       if (yych <= 'Z') goto yy111;
+                               }
                        } else {
-                               if (yych == ';') goto yy117;
-                               goto yy111;
+                               if (yych <= '^') {
+                                       if (yych <= '\\') goto yy114;
+                                       if (yych <= ']') goto yy115;
+                               } else {
+                                       if (yych == '`') goto yy96;
+                                       if (yych <= 'z') goto yy111;
+                               }
                        }
                }
-               YYDEBUG(109, *YYCURSOR);
+yy96:
+               YYDEBUG(96, *YYCURSOR);
+               yyaccept = 0;
+               YYMARKER = ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+yy97:
+               YYDEBUG(97, *YYCURSOR);
+               if (yybm[0+yych] & 4) {
+                       goto yy96;
+               }
+               if (yych <= '"') goto yy98;
+               if (yych <= '$') goto yy118;
+               if (yych <= ';') goto yy98;
+               if (yych <= '\\') goto yy114;
+yy98:
+               YYDEBUG(98, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 581 "Zend/zend_ini_scanner.l"
+               { /* Get rest as section/offset value */
+       RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+#line 1533 "Zend/zend_ini_scanner.c"
+yy99:
+               YYDEBUG(99, *YYCURSOR);
+               yyaccept = 0;
+               YYMARKER = ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               YYDEBUG(100, *YYCURSOR);
+               if (yybm[0+yych] & 8) {
+                       goto yy99;
+               }
+               if (yych <= '$') {
+                       if (yych <= '\r') {
+                               if (yych <= 0x08) goto yy96;
+                               if (yych <= '\n') goto yy98;
+                               if (yych <= '\f') goto yy96;
+                               goto yy98;
+                       } else {
+                               if (yych == '"') goto yy103;
+                               if (yych <= '#') goto yy96;
+                               goto yy118;
+                       }
+               } else {
+                       if (yych <= ';') {
+                               if (yych == '\'') goto yy98;
+                               if (yych <= ':') goto yy96;
+                               goto yy98;
+                       } else {
+                               if (yych <= '[') goto yy96;
+                               if (yych <= '\\') goto yy114;
+                               if (yych <= ']') goto yy98;
+                               goto yy96;
+                       }
+               }
+yy101:
+               YYDEBUG(101, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(110, *YYCURSOR);
+yy102:
+               YYDEBUG(102, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
-#line 651 "Zend/zend_ini_scanner.l"
-               { /* End of option value (if EOF is reached before EOL */
-       BEGIN(INITIAL);
-       return END_OF_LINE;
+#line 656 "Zend/zend_ini_scanner.l"
+               {
+       return 0;
 }
-#line 1634 "Zend/zend_ini_scanner.c"
-yy111:
-               YYDEBUG(111, *YYCURSOR);
+#line 1577 "Zend/zend_ini_scanner.c"
+yy103:
+               YYDEBUG(103, *YYCURSOR);
                ++YYCURSOR;
-yy112:
-               YYDEBUG(112, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 501 "Zend/zend_ini_scanner.l"
-               { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-       unsigned char *sc = NULL;
-       EAT_LEADING_WHITESPACE();
-       while (YYCURSOR < YYLIMIT) {
-               switch (*YYCURSOR) {
-                       case '\n':
-                       case '\r':
-                               goto end_raw_value_chars;
-                               break;
-                       case ';':
-                               if (sc == NULL) {
-                                       sc = YYCURSOR;
-                               }
-                               YYCURSOR++;
-                               break;
-                       case '"':
-                               if (yytext[0] == '"') {
-                                       sc = NULL;
-                               }
-                               YYCURSOR++;
-                               break;
-                       default:
-                               YYCURSOR++;
-                               break;
-               }
-       }
-end_raw_value_chars:
-       if (sc) {
-               yyleng = sc - SCNG(yy_text);
-       } else {
-               yyleng = YYCURSOR - SCNG(yy_text);
-       }
-
-       EAT_TRAILING_WHITESPACE();
-
-       /* Eat leading and trailing double quotes */
-       if (yyleng > 1 && yytext[0] == '"' && yytext[yyleng - 1] == '"') {
-               SCNG(yy_text)++;
-               yyleng = yyleng - 2;
-       }
-
-       RETURN_TOKEN(TC_RAW, yytext, yyleng);
-}
-#line 1685 "Zend/zend_ini_scanner.c"
-yy113:
-               YYDEBUG(113, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych <= '\r') {
-                       if (yych <= 0x08) goto yy112;
-                       if (yych <= '\n') goto yy119;
-                       if (yych <= '\f') goto yy112;
-                       goto yy119;
-               } else {
-                       if (yych <= ' ') {
-                               if (yych <= 0x1F) goto yy112;
-                               goto yy119;
-                       } else {
-                               if (yych == ';') goto yy119;
-                               goto yy112;
-                       }
-               }
-yy114:
-               YYDEBUG(114, *YYCURSOR);
-               ++YYCURSOR;
-yy115:
-               YYDEBUG(115, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 549 "Zend/zend_ini_scanner.l"
-               { /* End of option value */
-       BEGIN(INITIAL);
-       SCNG(lineno)++;
-       return END_OF_LINE;
-}
-#line 1715 "Zend/zend_ini_scanner.c"
-yy116:
-               YYDEBUG(116, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '\n') goto yy114;
-               goto yy115;
-yy117:
-               YYDEBUG(117, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy122;
-yy118:
-               YYDEBUG(118, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-yy119:
-               YYDEBUG(119, *YYCURSOR);
-               if (yybm[0+yych] & 64) {
-                       goto yy118;
-               }
-               if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy120;
-                       if (yych <= '\n') goto yy114;
-               } else {
-                       if (yych <= '\r') goto yy116;
-                       if (yych == ';') goto yy121;
-               }
-yy120:
-               YYDEBUG(120, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 635 "Zend/zend_ini_scanner.l"
-               {
-       /* eat whitespace */
-       goto restart;
-}
-#line 1750 "Zend/zend_ini_scanner.c"
-yy121:
-               YYDEBUG(121, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-yy122:
-               YYDEBUG(122, *YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy121;
-               }
-               if (yych >= '\v') goto yy125;
-yy123:
-               YYDEBUG(123, *YYCURSOR);
-               ++YYCURSOR;
-yy124:
-               YYDEBUG(124, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 645 "Zend/zend_ini_scanner.l"
-               { /* Comment */
-       BEGIN(INITIAL);
-       SCNG(lineno)++;
-       return END_OF_LINE;
-}
-#line 1774 "Zend/zend_ini_scanner.c"
-yy125:
-               YYDEBUG(125, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy123;
-               goto yy124;
-       }
-/* *********************************** */
-yyc_ST_SECTION_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,   0,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        64,  64,  64,  64,  64,  64,  64,  64, 
-                        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(126, *YYCURSOR);
-               YYFILL(1);
-               yych = *YYCURSOR;
-               if (yybm[0+yych] & 64) {
-                       goto yy128;
-               }
-               if (yych <= '\r') goto yy131;
-               goto yy133;
-yy128:
-               YYDEBUG(128, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(129, *YYCURSOR);
-               if (yybm[0+yych] & 64) {
-                       goto yy128;
-               }
-               YYDEBUG(130, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 545 "Zend/zend_ini_scanner.l"
-               { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-       RETURN_TOKEN(TC_RAW, yytext, yyleng);
-}
-#line 1841 "Zend/zend_ini_scanner.c"
-yy131:
-               YYDEBUG(131, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(132, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 656 "Zend/zend_ini_scanner.l"
-               {
-       return 0;
-}
-#line 1851 "Zend/zend_ini_scanner.c"
-yy133:
-               YYDEBUG(133, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-               YYDEBUG(134, *YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy133;
-               }
-               if (yych <= 0x08) goto yy135;
-               if (yych <= '\n') goto yy136;
-               if (yych == '\r') goto yy137;
-yy135:
-               YYDEBUG(135, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 426 "Zend/zend_ini_scanner.l"
-               { /* End of section */
-       BEGIN(INITIAL);
-       SCNG(lineno)++;
-       return ']';
-}
-#line 1873 "Zend/zend_ini_scanner.c"
-yy136:
-               YYDEBUG(136, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy135;
-yy137:
-               YYDEBUG(137, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy136;
-               goto yy135;
-       }
-/* *********************************** */
-yyc_ST_SECTION_VALUE:
-       {
-               static const unsigned char yybm[] = {
-                       132, 132, 132, 132, 132, 132, 132, 132, 
-                       132, 140, 128, 132, 132, 128, 132, 132, 
-                       132, 132, 132, 132, 132, 132, 132, 132, 
-                       132, 132, 132, 132, 132, 132, 132, 132, 
-                       140, 132, 128, 132, 192, 132, 132,   0, 
-                       132, 132, 132, 132, 132, 132, 132, 132, 
-                       180, 180, 180, 180, 180, 180, 180, 180, 
-                       180, 180, 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, 192, 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(138, *YYCURSOR);
-               YYFILL(2);
-               yych = *YYCURSOR;
-               if (yybm[0+yych] & 8) {
-                       goto yy143;
-               }
-               if (yych <= '/') {
-                       if (yych <= '"') {
-                               if (yych <= '\f') {
-                                       if (yych <= 0x08) goto yy140;
-                                       if (yych <= '\n') goto yy145;
-                               } else {
-                                       if (yych <= '\r') goto yy145;
-                                       if (yych >= '"') goto yy147;
-                               }
-                       } else {
-                               if (yych <= '&') {
-                                       if (yych == '$') goto yy149;
-                               } else {
-                                       if (yych <= '\'') goto yy150;
-                                       if (yych <= ',') goto yy140;
-                                       if (yych <= '.') goto yy151;
-                               }
-                       }
-               } else {
-                       if (yych <= '[') {
-                               if (yych <= ';') {
-                                       if (yych <= '9') goto yy152;
-                                       if (yych >= ';') goto yy145;
-                               } else {
-                                       if (yych <= '@') goto yy140;
-                                       if (yych <= 'Z') goto yy155;
-                               }
-                       } else {
-                               if (yych <= '^') {
-                                       if (yych <= '\\') goto yy158;
-                                       if (yych <= ']') goto yy159;
-                               } else {
-                                       if (yych == '`') goto yy140;
-                                       if (yych <= 'z') goto yy155;
-                               }
-                       }
-               }
-yy140:
-               YYDEBUG(140, *YYCURSOR);
-               yyaccept = 0;
-               YYMARKER = ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-yy141:
-               YYDEBUG(141, *YYCURSOR);
-               if (yybm[0+yych] & 4) {
-                       goto yy140;
-               }
-               if (yych <= '"') goto yy142;
-               if (yych <= '$') goto yy162;
-               if (yych <= ';') goto yy142;
-               if (yych <= '\\') goto yy164;
-yy142:
-               YYDEBUG(142, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 581 "Zend/zend_ini_scanner.l"
-               { /* Get rest as section/offset value */
-       RETURN_TOKEN(TC_STRING, yytext, yyleng);
-}
-#line 1986 "Zend/zend_ini_scanner.c"
-yy143:
-               YYDEBUG(143, *YYCURSOR);
-               yyaccept = 0;
-               YYMARKER = ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               YYDEBUG(144, *YYCURSOR);
-               if (yybm[0+yych] & 8) {
-                       goto yy143;
-               }
-               if (yych <= '$') {
-                       if (yych <= '\r') {
-                               if (yych <= 0x08) goto yy140;
-                               if (yych <= '\n') goto yy142;
-                               if (yych <= '\f') goto yy140;
-                               goto yy142;
-                       } else {
-                               if (yych == '"') goto yy147;
-                               if (yych <= '#') goto yy140;
-                               goto yy162;
-                       }
-               } else {
-                       if (yych <= ';') {
-                               if (yych == '\'') goto yy142;
-                               if (yych <= ':') goto yy140;
-                               goto yy142;
-                       } else {
-                               if (yych <= '[') goto yy140;
-                               if (yych <= '\\') goto yy164;
-                               if (yych <= ']') goto yy142;
-                               goto yy140;
-                       }
-               }
-yy145:
-               YYDEBUG(145, *YYCURSOR);
-               ++YYCURSOR;
-yy146:
-               YYDEBUG(146, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 656 "Zend/zend_ini_scanner.l"
-               {
-       return 0;
-}
-#line 2030 "Zend/zend_ini_scanner.c"
-yy147:
-               YYDEBUG(147, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(148, *YYCURSOR);
+               YYDEBUG(104, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 585 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string start */
        yy_push_state(ST_DOUBLE_QUOTES);
        return '"';
 }
-#line 2041 "Zend/zend_ini_scanner.c"
-yy149:
-               YYDEBUG(149, *YYCURSOR);
+#line 1588 "Zend/zend_ini_scanner.c"
+yy105:
+               YYDEBUG(105, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '\\') {
-                       if (yych <= 0x00) goto yy146;
-                       if (yych <= '[') goto yy140;
-                       goto yy165;
+                       if (yych <= 0x00) goto yy102;
+                       if (yych <= '[') goto yy96;
+                       goto yy120;
                } else {
-                       if (yych == '{') goto yy167;
-                       goto yy140;
+                       if (yych == '{') goto yy122;
+                       goto yy96;
                }
-yy150:
-               YYDEBUG(150, *YYCURSOR);
-               yyaccept = 1;
-               yych = *(YYMARKER = ++YYCURSOR);
+yy106:
+               YYDEBUG(106, *YYCURSOR);
+               yych = *++YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy169;
+                       goto yy124;
                }
-               goto yy146;
-yy151:
-               YYDEBUG(151, *YYCURSOR);
+               goto yy102;
+yy107:
+               YYDEBUG(107, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych <= '/') goto yy141;
-               if (yych <= '9') goto yy171;
-               goto yy141;
-yy152:
-               YYDEBUG(152, *YYCURSOR);
-               yyaccept = 2;
+               if (yych <= '/') goto yy97;
+               if (yych <= '9') goto yy126;
+               goto yy97;
+yy108:
+               YYDEBUG(108, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(153, *YYCURSOR);
+               YYDEBUG(109, *YYCURSOR);
                if (yybm[0+yych] & 16) {
-                       goto yy152;
+                       goto yy108;
                }
                if (yych <= '&') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy154;
-                               if (yych <= '\f') goto yy140;
+                               if (yych == '\n') goto yy110;
+                               if (yych <= '\f') goto yy96;
                        } else {
                                if (yych <= '"') {
-                                       if (yych <= '!') goto yy140;
+                                       if (yych <= '!') goto yy96;
                                } else {
-                                       if (yych == '$') goto yy162;
-                                       goto yy140;
+                                       if (yych == '$') goto yy118;
+                                       goto yy96;
                                }
                        }
                } else {
                        if (yych <= ':') {
-                               if (yych <= '\'') goto yy154;
-                               if (yych == '.') goto yy171;
-                               goto yy140;
+                               if (yych <= '\'') goto yy110;
+                               if (yych == '.') goto yy126;
+                               goto yy96;
                        } else {
                                if (yych <= '[') {
-                                       if (yych >= '<') goto yy140;
+                                       if (yych >= '<') goto yy96;
                                } else {
-                                       if (yych <= '\\') goto yy164;
-                                       if (yych >= '^') goto yy140;
+                                       if (yych <= '\\') goto yy114;
+                                       if (yych >= '^') goto yy96;
                                }
                        }
                }
-yy154:
-               YYDEBUG(154, *YYCURSOR);
+yy110:
+               YYDEBUG(110, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 559 "Zend/zend_ini_scanner.l"
                { /* Get number option value as string */
        RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 2111 "Zend/zend_ini_scanner.c"
-yy155:
-               YYDEBUG(155, *YYCURSOR);
-               yyaccept = 3;
+#line 1657 "Zend/zend_ini_scanner.c"
+yy111:
+               YYDEBUG(111, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(156, *YYCURSOR);
+               YYDEBUG(112, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy155;
+                       goto yy111;
                }
                if (yych <= '$') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy157;
-                               if (yych <= '\f') goto yy140;
+                               if (yych == '\n') goto yy113;
+                               if (yych <= '\f') goto yy96;
                        } else {
-                               if (yych == '"') goto yy157;
-                               if (yych <= '#') goto yy140;
-                               goto yy162;
+                               if (yych == '"') goto yy113;
+                               if (yych <= '#') goto yy96;
+                               goto yy118;
                        }
                } else {
                        if (yych <= ';') {
-                               if (yych == '\'') goto yy157;
-                               if (yych <= ':') goto yy140;
+                               if (yych == '\'') goto yy113;
+                               if (yych <= ':') goto yy96;
                        } else {
-                               if (yych <= '[') goto yy140;
-                               if (yych <= '\\') goto yy164;
-                               if (yych >= '^') goto yy140;
+                               if (yych <= '[') goto yy96;
+                               if (yych <= '\\') goto yy114;
+                               if (yych >= '^') goto yy96;
                        }
                }
-yy157:
-               YYDEBUG(157, *YYCURSOR);
+yy113:
+               YYDEBUG(113, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 555 "Zend/zend_ini_scanner.l"
                { /* Get constant option value */
        RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 2148 "Zend/zend_ini_scanner.c"
-yy158:
-               YYDEBUG(158, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy140;
-yy159:
-               YYDEBUG(159, *YYCURSOR);
+#line 1694 "Zend/zend_ini_scanner.c"
+yy114:
+               YYDEBUG(114, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               goto yy96;
+yy115:
+               YYDEBUG(115, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(160, *YYCURSOR);
+               YYDEBUG(116, *YYCURSOR);
                if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy161;
-                       if (yych <= '\t') goto yy159;
-                       if (yych <= '\n') goto yy173;
+                       if (yych <= 0x08) goto yy117;
+                       if (yych <= '\t') goto yy115;
+                       if (yych <= '\n') goto yy128;
                } else {
-                       if (yych <= '\r') goto yy174;
-                       if (yych == ' ') goto yy159;
+                       if (yych <= '\r') goto yy129;
+                       if (yych == ' ') goto yy115;
                }
-yy161:
-               YYDEBUG(161, *YYCURSOR);
+yy117:
+               YYDEBUG(117, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 426 "Zend/zend_ini_scanner.l"
                { /* End of section */
@@ -2172,123 +1720,113 @@ yy161:
        SCNG(lineno)++;
        return ']';
 }
-#line 2176 "Zend/zend_ini_scanner.c"
-yy162:
-               YYDEBUG(162, *YYCURSOR);
+#line 1724 "Zend/zend_ini_scanner.c"
+yy118:
+               YYDEBUG(118, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yych <= '\\') {
-                       if (yych <= 0x00) goto yy163;
-                       if (yych <= '[') goto yy140;
-                       goto yy165;
+                       if (yych <= 0x00) goto yy119;
+                       if (yych <= '[') goto yy96;
+                       goto yy120;
                } else {
-                       if (yych != '{') goto yy140;
+                       if (yych != '{') goto yy96;
                }
-yy163:
-               YYDEBUG(163, *YYCURSOR);
+yy119:
+               YYDEBUG(119, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 1) {
                        if (yyaccept == 0) {
-                               goto yy142;
+                               goto yy98;
                        } else {
-                               goto yy146;
+                               goto yy110;
                        }
                } else {
-                       if (yyaccept == 2) {
-                               goto yy154;
-                       } else {
-                               goto yy157;
-                       }
+                       goto yy113;
                }
-yy164:
-               YYDEBUG(164, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(1);
-               yych = *YYCURSOR;
-               goto yy140;
-yy165:
-               YYDEBUG(165, *YYCURSOR);
+yy120:
+               YYDEBUG(120, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(166, *YYCURSOR);
+               YYDEBUG(121, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy165;
+                       goto yy120;
                }
-               goto yy140;
-yy167:
-               YYDEBUG(167, *YYCURSOR);
+               goto yy96;
+yy122:
+               YYDEBUG(122, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(168, *YYCURSOR);
+               YYDEBUG(123, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 450 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME);
        return TC_DOLLAR_CURLY;
 }
-#line 2231 "Zend/zend_ini_scanner.c"
-yy169:
-               YYDEBUG(169, *YYCURSOR);
+#line 1769 "Zend/zend_ini_scanner.c"
+yy124:
+               YYDEBUG(124, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(170, *YYCURSOR);
+               YYDEBUG(125, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy169;
+                       goto yy124;
                }
-               goto yy175;
-yy171:
-               YYDEBUG(171, *YYCURSOR);
-               yyaccept = 2;
+               goto yy130;
+yy126:
+               YYDEBUG(126, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(172, *YYCURSOR);
+               YYDEBUG(127, *YYCURSOR);
                if (yych <= '&') {
                        if (yych <= '\r') {
-                               if (yych == '\n') goto yy154;
-                               if (yych <= '\f') goto yy140;
-                               goto yy154;
+                               if (yych == '\n') goto yy110;
+                               if (yych <= '\f') goto yy96;
+                               goto yy110;
                        } else {
                                if (yych <= '"') {
-                                       if (yych <= '!') goto yy140;
-                                       goto yy154;
+                                       if (yych <= '!') goto yy96;
+                                       goto yy110;
                                } else {
-                                       if (yych == '$') goto yy162;
-                                       goto yy140;
+                                       if (yych == '$') goto yy118;
+                                       goto yy96;
                                }
                        }
                } else {
                        if (yych <= ':') {
-                               if (yych <= '\'') goto yy154;
-                               if (yych <= '/') goto yy140;
-                               if (yych <= '9') goto yy171;
-                               goto yy140;
+                               if (yych <= '\'') goto yy110;
+                               if (yych <= '/') goto yy96;
+                               if (yych <= '9') goto yy126;
+                               goto yy96;
                        } else {
                                if (yych <= '[') {
-                                       if (yych <= ';') goto yy154;
-                                       goto yy140;
+                                       if (yych <= ';') goto yy110;
+                                       goto yy96;
                                } else {
-                                       if (yych <= '\\') goto yy164;
-                                       if (yych <= ']') goto yy154;
-                                       goto yy140;
+                                       if (yych <= '\\') goto yy114;
+                                       if (yych <= ']') goto yy110;
+                                       goto yy96;
                                }
                        }
                }
-yy173:
-               YYDEBUG(173, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy161;
-yy174:
-               YYDEBUG(174, *YYCURSOR);
+yy128:
+               YYDEBUG(128, *YYCURSOR);
+               ++YYCURSOR;
+               goto yy117;
+yy129:
+               YYDEBUG(129, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy173;
-               goto yy161;
-yy175:
-               YYDEBUG(175, *YYCURSOR);
+               if (yych == '\n') goto yy128;
+               goto yy117;
+yy130:
+               YYDEBUG(130, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(176, *YYCURSOR);
+               YYDEBUG(131, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 417 "Zend/zend_ini_scanner.l"
                { /* Raw string */
@@ -2299,56 +1837,56 @@ yy175:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 2303 "Zend/zend_ini_scanner.c"
+#line 1841 "Zend/zend_ini_scanner.c"
        }
 /* *********************************** */
 yyc_ST_VALUE:
        {
                static const unsigned char yybm[] = {
-                        96,  98,  98,  98,  98,  98,  98,  98
-                        98, 100,  64,  98,  98,  64,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                       100,  96,  96,  98, 224,  98,  96,  32
-                        96,  96,  98,  98,  98,  98,  98,  98
+                        80,  82,  82,  82,  82,  82,  82,  82
+                        82,  84,  64,  82,  82,  64,  82,  82
+                        82,  82,  82,  82,  82,  82,  82,  82
+                        82,  82,  82,  82,  82,  82,  82,  82
+                        84,  80,  80,  82, 208,  82,  80,  16
+                        80,  80,  82,  82,  82,  82,  82,  82
                        122, 122, 122, 122, 122, 122, 122, 122, 
-                       122, 122,  98,  96,  98,  96,  98,  98
-                        98, 114, 114, 114, 114, 114, 114, 114, 
+                       122, 122,  82,  80,  82,  80,  82,  82
+                        82, 114, 114, 114, 114, 114, 114, 114, 
                        114, 114, 114, 114, 114, 114, 114, 114, 
                        114, 114, 114, 114, 114, 114, 114, 114, 
-                       114, 114, 114,  98,  98,  98,  96, 114, 
-                        98, 114, 114, 114, 114, 114, 114, 114, 
+                       114, 114, 114,  82,  82,  82,  80, 114, 
+                        82, 114, 114, 114, 114, 114, 114, 114, 
                        114, 114, 114, 114, 114, 114, 114, 114, 
                        114, 114, 114, 114, 114, 114, 114, 114, 
-                       114, 114, 114,  98,  96,  98,  96,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
-                        98,  98,  98,  98,  98,  98,  98,  98
+                       114, 114, 114,  82,  80,  82,  80,  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,  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,  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,  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,  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
                };
-               YYDEBUG(177, *YYCURSOR);
+               YYDEBUG(132, *YYCURSOR);
                YYFILL(6);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 4) {
-                       goto yy184;
+                       goto yy139;
                }
                switch (yych) {
-               case 0x00:      goto yy179;
+               case 0x00:      goto yy134;
                case '\t':
-               case '\n':      goto yy187;
-               case '\r':      goto yy189;
+               case '\n':      goto yy142;
+               case '\r':      goto yy144;
                case ' ':
                case '!':
                case '&':
@@ -2356,12 +1894,12 @@ yyc_ST_VALUE:
                case ')':
                case '^':
                case '|':
-               case '~':       goto yy190;
-               case '"':       goto yy193;
-               case '$':       goto yy195;
-               case '\'':      goto yy196;
+               case '~':       goto yy145;
+               case '"':       goto yy148;
+               case '$':       goto yy150;
+               case '\'':      goto yy151;
                case '-':
-               case '.':       goto yy197;
+               case '.':       goto yy152;
                case '0':
                case '1':
                case '2':
@@ -2371,9 +1909,9 @@ yyc_ST_VALUE:
                case '6':
                case '7':
                case '8':
-               case '9':       goto yy198;
-               case ';':       goto yy201;
-               case '=':       goto yy202;
+               case '9':       goto yy153;
+               case ';':       goto yy156;
+               case '=':       goto yy158;
                case 'A':
                case 'B':
                case 'C':
@@ -2416,86 +1954,85 @@ yyc_ST_VALUE:
                case 'v':
                case 'w':
                case 'x':
-               case 'z':       goto yy204;
+               case 'z':       goto yy160;
                case 'F':
-               case 'f':       goto yy207;
+               case 'f':       goto yy163;
                case 'N':
-               case 'n':       goto yy208;
+               case 'n':       goto yy164;
                case 'O':
-               case 'o':       goto yy209;
+               case 'o':       goto yy165;
                case 'T':
-               case 't':       goto yy210;
+               case 't':       goto yy166;
                case 'Y':
-               case 'y':       goto yy211;
-               default:        goto yy181;
+               case 'y':       goto yy167;
+               default:        goto yy136;
                }
-yy179:
-               YYDEBUG(179, *YYCURSOR);
+yy134:
+               YYDEBUG(134, *YYCURSOR);
                ++YYCURSOR;
-yy180:
-               YYDEBUG(180, *YYCURSOR);
+yy135:
+               YYDEBUG(135, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 651 "Zend/zend_ini_scanner.l"
                { /* End of option value (if EOF is reached before EOL */
        BEGIN(INITIAL);
        return END_OF_LINE;
 }
-#line 2444 "Zend/zend_ini_scanner.c"
-yy181:
-               YYDEBUG(181, *YYCURSOR);
+#line 1982 "Zend/zend_ini_scanner.c"
+yy136:
+               YYDEBUG(136, *YYCURSOR);
                yyaccept = 0;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy182:
-               YYDEBUG(182, *YYCURSOR);
+yy137:
+               YYDEBUG(137, *YYCURSOR);
                if (yybm[0+yych] & 2) {
-                       goto yy181;
+                       goto yy136;
                }
-               if (yych <= '"') goto yy183;
-               if (yych <= '$') goto yy212;
-yy183:
-               YYDEBUG(183, *YYCURSOR);
+               if (yych <= '"') goto yy138;
+               if (yych <= '$') goto yy168;
+yy138:
+               YYDEBUG(138, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 577 "Zend/zend_ini_scanner.l"
                { /* Get everything else as option/offset value */
        RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 2465 "Zend/zend_ini_scanner.c"
-yy184:
-               YYDEBUG(184, *YYCURSOR);
-               yyaccept = 1;
-               YYMARKER = ++YYCURSOR;
+#line 2003 "Zend/zend_ini_scanner.c"
+yy139:
+               YYDEBUG(139, *YYCURSOR);
+               ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(185, *YYCURSOR);
+               YYDEBUG(140, *YYCURSOR);
                if (yybm[0+yych] & 4) {
-                       goto yy184;
+                       goto yy139;
                }
                if (yych <= '\r') {
-                       if (yych <= 0x08) goto yy186;
-                       if (yych <= '\n') goto yy187;
-                       if (yych >= '\r') goto yy189;
+                       if (yych <= 0x08) goto yy141;
+                       if (yych <= '\n') goto yy142;
+                       if (yych >= '\r') goto yy144;
                } else {
                        if (yych <= '"') {
-                               if (yych >= '"') goto yy193;
+                               if (yych >= '"') goto yy148;
                        } else {
-                               if (yych == ';') goto yy214;
+                               if (yych == ';') goto yy156;
                        }
                }
-yy186:
-               YYDEBUG(186, *YYCURSOR);
+yy141:
+               YYDEBUG(141, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 631 "Zend/zend_ini_scanner.l"
                {
        RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
 }
-#line 2494 "Zend/zend_ini_scanner.c"
-yy187:
-               YYDEBUG(187, *YYCURSOR);
+#line 2031 "Zend/zend_ini_scanner.c"
+yy142:
+               YYDEBUG(142, *YYCURSOR);
                ++YYCURSOR;
-yy188:
-               YYDEBUG(188, *YYCURSOR);
+yy143:
+               YYDEBUG(143, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 549 "Zend/zend_ini_scanner.l"
                { /* End of option value */
@@ -2503,126 +2040,131 @@ yy188:
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 2507 "Zend/zend_ini_scanner.c"
-yy189:
-               YYDEBUG(189, *YYCURSOR);
+#line 2044 "Zend/zend_ini_scanner.c"
+yy144:
+               YYDEBUG(144, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy187;
-               goto yy188;
-yy190:
-               YYDEBUG(190, *YYCURSOR);
+               if (yych == '\n') goto yy142;
+               goto yy143;
+yy145:
+               YYDEBUG(145, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(191, *YYCURSOR);
-               if (yych == '\t') goto yy190;
-               if (yych == ' ') goto yy190;
-               YYDEBUG(192, *YYCURSOR);
+               YYDEBUG(146, *YYCURSOR);
+               if (yych == '\t') goto yy145;
+               if (yych == ' ') goto yy145;
+               YYDEBUG(147, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 567 "Zend/zend_ini_scanner.l"
                { /* Boolean operators */
        return yytext[0];
 }
-#line 2527 "Zend/zend_ini_scanner.c"
-yy193:
-               YYDEBUG(193, *YYCURSOR);
+#line 2064 "Zend/zend_ini_scanner.c"
+yy148:
+               YYDEBUG(148, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(194, *YYCURSOR);
+               YYDEBUG(149, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 585 "Zend/zend_ini_scanner.l"
                { /* Double quoted '"' string start */
        yy_push_state(ST_DOUBLE_QUOTES);
        return '"';
 }
-#line 2538 "Zend/zend_ini_scanner.c"
-yy195:
-               YYDEBUG(195, *YYCURSOR);
+#line 2075 "Zend/zend_ini_scanner.c"
+yy150:
+               YYDEBUG(150, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yych <= '\\') {
-                       if (yych <= 0x00) goto yy180;
-                       if (yych <= '[') goto yy181;
-                       goto yy216;
+                       if (yych <= 0x00) goto yy135;
+                       if (yych <= '[') goto yy136;
+                       goto yy170;
                } else {
-                       if (yych == '{') goto yy217;
-                       goto yy181;
+                       if (yych == '{') goto yy171;
+                       goto yy136;
                }
-yy196:
-               YYDEBUG(196, *YYCURSOR);
-               yyaccept = 2;
-               yych = *(YYMARKER = ++YYCURSOR);
+yy151:
+               YYDEBUG(151, *YYCURSOR);
+               yych = *++YYCURSOR;
                if (yybm[0+yych] & 64) {
-                       goto yy219;
+                       goto yy173;
                }
-               goto yy180;
-yy197:
-               YYDEBUG(197, *YYCURSOR);
+               goto yy135;
+yy152:
+               YYDEBUG(152, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych <= '/') goto yy182;
-               if (yych <= '9') goto yy221;
-               goto yy182;
-yy198:
-               YYDEBUG(198, *YYCURSOR);
-               yyaccept = 3;
+               if (yych <= '/') goto yy137;
+               if (yych <= '9') goto yy175;
+               goto yy137;
+yy153:
+               YYDEBUG(153, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(199, *YYCURSOR);
+               YYDEBUG(154, *YYCURSOR);
                if (yybm[0+yych] & 8) {
-                       goto yy198;
+                       goto yy153;
                }
                if (yych <= '-') {
                        if (yych <= 0x1F) {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy200;
-                                       if (yych <= 0x08) goto yy181;
+                                       if (yych <= 0x00) goto yy155;
+                                       if (yych <= 0x08) goto yy136;
                                } else {
-                                       if (yych != '\r') goto yy181;
+                                       if (yych != '\r') goto yy136;
                                }
                        } else {
                                if (yych <= '$') {
-                                       if (yych <= '"') goto yy200;
-                                       if (yych <= '#') goto yy181;
-                                       goto yy212;
+                                       if (yych <= '"') goto yy155;
+                                       if (yych <= '#') goto yy136;
+                                       goto yy168;
                                } else {
-                                       if (yych <= '%') goto yy181;
-                                       if (yych >= '*') goto yy181;
+                                       if (yych <= '%') goto yy136;
+                                       if (yych >= '*') goto yy136;
                                }
                        }
                } else {
                        if (yych <= ']') {
                                if (yych <= ';') {
-                                       if (yych <= '.') goto yy221;
-                                       if (yych <= ':') goto yy181;
+                                       if (yych <= '.') goto yy175;
+                                       if (yych <= ':') goto yy136;
                                } else {
-                                       if (yych != '=') goto yy181;
+                                       if (yych != '=') goto yy136;
                                }
                        } else {
                                if (yych <= '|') {
-                                       if (yych <= '^') goto yy200;
-                                       if (yych <= '{') goto yy181;
+                                       if (yych <= '^') goto yy155;
+                                       if (yych <= '{') goto yy136;
                                } else {
-                                       if (yych != '~') goto yy181;
+                                       if (yych != '~') goto yy136;
                                }
                        }
                }
-yy200:
-               YYDEBUG(200, *YYCURSOR);
+yy155:
+               YYDEBUG(155, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 559 "Zend/zend_ini_scanner.l"
                { /* Get number option value as string */
        RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 2617 "Zend/zend_ini_scanner.c"
-yy201:
-               YYDEBUG(201, *YYCURSOR);
-               yyaccept = 2;
-               yych = *(YYMARKER = ++YYCURSOR);
-               goto yy215;
-yy202:
-               YYDEBUG(202, *YYCURSOR);
+#line 2153 "Zend/zend_ini_scanner.c"
+yy156:
+               YYDEBUG(156, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(203, *YYCURSOR);
+               YYFILL(2);
+               yych = *YYCURSOR;
+               YYDEBUG(157, *YYCURSOR);
+               if (yybm[0+yych] & 16) {
+                       goto yy156;
+               }
+               if (yych <= '\n') goto yy177;
+               goto yy179;
+yy158:
+               YYDEBUG(158, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(159, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 571 "Zend/zend_ini_scanner.l"
                { /* Make = used in option value to trigger error */
@@ -2630,481 +2172,461 @@ yy202:
        BEGIN(INITIAL);
        return END_OF_LINE;
 }
-#line 2634 "Zend/zend_ini_scanner.c"
-yy204:
-               YYDEBUG(204, *YYCURSOR);
-               yyaccept = 4;
+#line 2176 "Zend/zend_ini_scanner.c"
+yy160:
+               YYDEBUG(160, *YYCURSOR);
+               yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(205, *YYCURSOR);
-               if (yybm[0+yych] & 16) {
-                       goto yy204;
+               YYDEBUG(161, *YYCURSOR);
+               if (yybm[0+yych] & 32) {
+                       goto yy160;
                }
                if (yych <= ')') {
                        if (yych <= '\r') {
                                if (yych <= 0x08) {
-                                       if (yych >= 0x01) goto yy181;
+                                       if (yych >= 0x01) goto yy136;
                                } else {
-                                       if (yych <= '\n') goto yy206;
-                                       if (yych <= '\f') goto yy181;
+                                       if (yych <= '\n') goto yy162;
+                                       if (yych <= '\f') goto yy136;
                                }
                        } else {
                                if (yych <= '#') {
-                                       if (yych <= 0x1F) goto yy181;
-                                       if (yych >= '#') goto yy181;
+                                       if (yych <= 0x1F) goto yy136;
+                                       if (yych >= '#') goto yy136;
                                } else {
-                                       if (yych <= '$') goto yy212;
-                                       if (yych <= '%') goto yy181;
+                                       if (yych <= '$') goto yy168;
+                                       if (yych <= '%') goto yy136;
                                }
                        }
                } else {
                        if (yych <= ']') {
                                if (yych <= ';') {
-                                       if (yych <= ':') goto yy181;
+                                       if (yych <= ':') goto yy136;
                                } else {
-                                       if (yych != '=') goto yy181;
+                                       if (yych != '=') goto yy136;
                                }
                        } else {
                                if (yych <= '|') {
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '{') goto yy181;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '{') goto yy136;
                                } else {
-                                       if (yych != '~') goto yy181;
+                                       if (yych != '~') goto yy136;
                                }
                        }
                }
-yy206:
-               YYDEBUG(206, *YYCURSOR);
+yy162:
+               YYDEBUG(162, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 555 "Zend/zend_ini_scanner.l"
                { /* Get constant option value */
        RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 2685 "Zend/zend_ini_scanner.c"
-yy207:
-               YYDEBUG(207, *YYCURSOR);
-               yyaccept = 4;
+#line 2227 "Zend/zend_ini_scanner.c"
+yy163:
+               YYDEBUG(163, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '<') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '/') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       goto yy182;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       goto yy137;
                                } else {
-                                       if (yych <= '9') goto yy204;
-                                       if (yych == ';') goto yy206;
-                                       goto yy182;
+                                       if (yych <= '9') goto yy160;
+                                       if (yych == ';') goto yy162;
+                                       goto yy137;
                                }
                        }
                } else {
                        if (yych <= '_') {
                                if (yych <= 'A') {
-                                       if (yych <= '=') goto yy206;
-                                       if (yych <= '@') goto yy182;
-                                       goto yy226;
+                                       if (yych <= '=') goto yy162;
+                                       if (yych <= '@') goto yy137;
+                                       goto yy180;
                                } else {
-                                       if (yych <= 'Z') goto yy204;
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       goto yy204;
+                                       if (yych <= 'Z') goto yy160;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       goto yy160;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych <= '`') goto yy182;
-                                       if (yych <= 'a') goto yy226;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych <= '`') goto yy137;
+                                       if (yych <= 'a') goto yy180;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy208:
-               YYDEBUG(208, *YYCURSOR);
-               yyaccept = 4;
+yy164:
+               YYDEBUG(164, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'N') {
                        if (yych <= '%') {
                                if (yych <= '\f') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       if (yych <= '\n') goto yy206;
-                                       goto yy182;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       if (yych <= '\n') goto yy162;
+                                       goto yy137;
                                } else {
-                                       if (yych <= '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       if (yych <= '"') goto yy206;
-                                       goto yy182;
+                                       if (yych <= '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       if (yych <= '"') goto yy162;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= ':') {
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       if (yych <= '9') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       if (yych <= '9') goto yy160;
+                                       goto yy137;
                                } else {
                                        if (yych <= '<') {
-                                               if (yych <= ';') goto yy206;
-                                               goto yy182;
+                                               if (yych <= ';') goto yy162;
+                                               goto yy137;
                                        } else {
-                                               if (yych <= '=') goto yy206;
-                                               if (yych <= '@') goto yy182;
-                                               goto yy204;
+                                               if (yych <= '=') goto yy162;
+                                               if (yych <= '@') goto yy137;
+                                               goto yy160;
                                        }
                                }
                        }
                } else {
                        if (yych <= 'n') {
                                if (yych <= 'Z') {
-                                       if (yych <= 'O') goto yy227;
-                                       if (yych == 'U') goto yy229;
-                                       goto yy204;
+                                       if (yych <= 'O') goto yy181;
+                                       if (yych == 'U') goto yy183;
+                                       goto yy160;
                                } else {
                                        if (yych <= '^') {
-                                               if (yych <= ']') goto yy182;
-                                               goto yy206;
+                                               if (yych <= ']') goto yy137;
+                                               goto yy162;
                                        } else {
-                                               if (yych == '`') goto yy182;
-                                               goto yy204;
+                                               if (yych == '`') goto yy137;
+                                               goto yy160;
                                        }
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych <= 'o') goto yy227;
-                                       if (yych == 'u') goto yy229;
-                                       goto yy204;
+                                       if (yych <= 'o') goto yy181;
+                                       if (yych == 'u') goto yy183;
+                                       goto yy160;
                                } else {
                                        if (yych <= '|') {
-                                               if (yych <= '{') goto yy182;
-                                               goto yy206;
+                                               if (yych <= '{') goto yy137;
+                                               goto yy162;
                                        } else {
-                                               if (yych == '~') goto yy206;
-                                               goto yy182;
+                                               if (yych == '~') goto yy162;
+                                               goto yy137;
                                        }
                                }
                        }
                }
-yy209:
-               YYDEBUG(209, *YYCURSOR);
-               yyaccept = 4;
+yy165:
+               YYDEBUG(165, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'E') {
                        if (yych <= '%') {
                                if (yych <= '\f') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       if (yych <= '\n') goto yy206;
-                                       goto yy182;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       if (yych <= '\n') goto yy162;
+                                       goto yy137;
                                } else {
-                                       if (yych <= '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       if (yych <= '"') goto yy206;
-                                       goto yy182;
+                                       if (yych <= '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       if (yych <= '"') goto yy162;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= ':') {
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       if (yych <= '9') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       if (yych <= '9') goto yy160;
+                                       goto yy137;
                                } else {
                                        if (yych <= '<') {
-                                               if (yych <= ';') goto yy206;
-                                               goto yy182;
+                                               if (yych <= ';') goto yy162;
+                                               goto yy137;
                                        } else {
-                                               if (yych <= '=') goto yy206;
-                                               if (yych <= '@') goto yy182;
-                                               goto yy204;
+                                               if (yych <= '=') goto yy162;
+                                               if (yych <= '@') goto yy137;
+                                               goto yy160;
                                        }
                                }
                        }
                } else {
                        if (yych <= 'e') {
                                if (yych <= 'Z') {
-                                       if (yych <= 'F') goto yy230;
-                                       if (yych == 'N') goto yy231;
-                                       goto yy204;
+                                       if (yych <= 'F') goto yy184;
+                                       if (yych == 'N') goto yy185;
+                                       goto yy160;
                                } else {
                                        if (yych <= '^') {
-                                               if (yych <= ']') goto yy182;
-                                               goto yy206;
+                                               if (yych <= ']') goto yy137;
+                                               goto yy162;
                                        } else {
-                                               if (yych == '`') goto yy182;
-                                               goto yy204;
+                                               if (yych == '`') goto yy137;
+                                               goto yy160;
                                        }
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych <= 'f') goto yy230;
-                                       if (yych == 'n') goto yy231;
-                                       goto yy204;
+                                       if (yych <= 'f') goto yy184;
+                                       if (yych == 'n') goto yy185;
+                                       goto yy160;
                                } else {
                                        if (yych <= '|') {
-                                               if (yych <= '{') goto yy182;
-                                               goto yy206;
+                                               if (yych <= '{') goto yy137;
+                                               goto yy162;
                                        } else {
-                                               if (yych == '~') goto yy206;
-                                               goto yy182;
+                                               if (yych == '~') goto yy162;
+                                               goto yy137;
                                        }
                                }
                        }
                }
-yy210:
-               YYDEBUG(210, *YYCURSOR);
-               yyaccept = 4;
+yy166:
+               YYDEBUG(166, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'R') goto yy233;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'R') goto yy187;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'r') goto yy233;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'r') goto yy187;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy211:
-               YYDEBUG(211, *YYCURSOR);
-               yyaccept = 4;
+yy167:
+               YYDEBUG(167, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'E') goto yy234;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'E') goto yy188;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'e') goto yy234;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'e') goto yy188;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy212:
-               YYDEBUG(212, *YYCURSOR);
+yy168:
+               YYDEBUG(168, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yych <= '\\') {
-                       if (yych <= 0x00) goto yy213;
-                       if (yych <= '[') goto yy181;
-                       goto yy216;
+                       if (yych <= 0x00) goto yy169;
+                       if (yych <= '[') goto yy136;
+                       goto yy170;
                } else {
-                       if (yych != '{') goto yy181;
+                       if (yych != '{') goto yy136;
                }
-yy213:
-               YYDEBUG(213, *YYCURSOR);
+yy169:
+               YYDEBUG(169, *YYCURSOR);
                YYCURSOR = YYMARKER;
-               if (yyaccept <= 3) {
+               if (yyaccept <= 2) {
                        if (yyaccept <= 1) {
                                if (yyaccept == 0) {
-                                       goto yy183;
+                                       goto yy138;
                                } else {
-                                       goto yy186;
+                                       goto yy155;
                                }
                        } else {
-                               if (yyaccept == 2) {
-                                       goto yy180;
-                               } else {
-                                       goto yy200;
-                               }
+                               goto yy162;
                        }
                } else {
-                       if (yyaccept <= 5) {
-                               if (yyaccept == 4) {
-                                       goto yy206;
+                       if (yyaccept <= 4) {
+                               if (yyaccept == 3) {
+                                       goto yy182;
                                } else {
-                                       goto yy228;
+                                       goto yy186;
                                }
                        } else {
-                               if (yyaccept == 6) {
-                                       goto yy232;
-                               } else {
-                                       goto yy249;
-                               }
+                               goto yy203;
                        }
                }
-yy214:
-               YYDEBUG(214, *YYCURSOR);
-               ++YYCURSOR;
-               YYFILL(2);
-               yych = *YYCURSOR;
-yy215:
-               YYDEBUG(215, *YYCURSOR);
-               if (yybm[0+yych] & 32) {
-                       goto yy214;
-               }
-               if (yych <= '\n') goto yy223;
-               goto yy225;
-yy216:
-               YYDEBUG(216, *YYCURSOR);
+yy170:
+               YYDEBUG(170, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy235;
+                       goto yy189;
                }
-               goto yy181;
-yy217:
-               YYDEBUG(217, *YYCURSOR);
+               goto yy136;
+yy171:
+               YYDEBUG(171, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(218, *YYCURSOR);
+               YYDEBUG(172, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 450 "Zend/zend_ini_scanner.l"
                { /* Variable start */
        yy_push_state(ST_VARNAME);
        return TC_DOLLAR_CURLY;
 }
-#line 3044 "Zend/zend_ini_scanner.c"
-yy219:
-               YYDEBUG(219, *YYCURSOR);
+#line 2566 "Zend/zend_ini_scanner.c"
+yy173:
+               YYDEBUG(173, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(220, *YYCURSOR);
+               YYDEBUG(174, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy219;
+                       goto yy173;
                }
-               goto yy237;
-yy221:
-               YYDEBUG(221, *YYCURSOR);
-               yyaccept = 3;
+               goto yy191;
+yy175:
+               YYDEBUG(175, *YYCURSOR);
+               yyaccept = 1;
                YYMARKER = ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(222, *YYCURSOR);
+               YYDEBUG(176, *YYCURSOR);
                if (yych <= '/') {
                        if (yych <= 0x1F) {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy200;
-                                       if (yych <= 0x08) goto yy181;
-                                       goto yy200;
+                                       if (yych <= 0x00) goto yy155;
+                                       if (yych <= 0x08) goto yy136;
+                                       goto yy155;
                                } else {
-                                       if (yych == '\r') goto yy200;
-                                       goto yy181;
+                                       if (yych == '\r') goto yy155;
+                                       goto yy136;
                                }
                        } else {
                                if (yych <= '$') {
-                                       if (yych <= '"') goto yy200;
-                                       if (yych <= '#') goto yy181;
-                                       goto yy212;
+                                       if (yych <= '"') goto yy155;
+                                       if (yych <= '#') goto yy136;
+                                       goto yy168;
                                } else {
-                                       if (yych <= '%') goto yy181;
-                                       if (yych <= ')') goto yy200;
-                                       goto yy181;
+                                       if (yych <= '%') goto yy136;
+                                       if (yych <= ')') goto yy155;
+                                       goto yy136;
                                }
                        }
                } else {
                        if (yych <= ']') {
                                if (yych <= ';') {
-                                       if (yych <= '9') goto yy221;
-                                       if (yych <= ':') goto yy181;
-                                       goto yy200;
+                                       if (yych <= '9') goto yy175;
+                                       if (yych <= ':') goto yy136;
+                                       goto yy155;
                                } else {
-                                       if (yych == '=') goto yy200;
-                                       goto yy181;
+                                       if (yych == '=') goto yy155;
+                                       goto yy136;
                                }
                        } else {
                                if (yych <= '|') {
-                                       if (yych <= '^') goto yy200;
-                                       if (yych <= '{') goto yy181;
-                                       goto yy200;
+                                       if (yych <= '^') goto yy155;
+                                       if (yych <= '{') goto yy136;
+                                       goto yy155;
                                } else {
-                                       if (yych == '~') goto yy200;
-                                       goto yy181;
+                                       if (yych == '~') goto yy155;
+                                       goto yy136;
                                }
                        }
                }
-yy223:
-               YYDEBUG(223, *YYCURSOR);
+yy177:
+               YYDEBUG(177, *YYCURSOR);
                ++YYCURSOR;
-yy224:
-               YYDEBUG(224, *YYCURSOR);
+yy178:
+               YYDEBUG(178, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 645 "Zend/zend_ini_scanner.l"
                { /* Comment */
@@ -3112,391 +2634,391 @@ yy224:
        SCNG(lineno)++;
        return END_OF_LINE;
 }
-#line 3116 "Zend/zend_ini_scanner.c"
-yy225:
-               YYDEBUG(225, *YYCURSOR);
+#line 2638 "Zend/zend_ini_scanner.c"
+yy179:
+               YYDEBUG(179, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych == '\n') goto yy223;
-               goto yy224;
-yy226:
-               YYDEBUG(226, *YYCURSOR);
-               yyaccept = 4;
+               if (yych == '\n') goto yy177;
+               goto yy178;
+yy180:
+               YYDEBUG(180, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'L') goto yy239;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'L') goto yy193;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'l') goto yy239;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'l') goto yy193;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy227:
-               YYDEBUG(227, *YYCURSOR);
-               yyaccept = 5;
+yy181:
+               YYDEBUG(181, *YYCURSOR);
+               yyaccept = 3;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '<') {
                        if (yych <= ' ') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy228;
-                                       if (yych <= 0x08) goto yy182;
-                                       if (yych <= '\t') goto yy240;
+                                       if (yych <= 0x00) goto yy182;
+                                       if (yych <= 0x08) goto yy137;
+                                       if (yych <= '\t') goto yy194;
                                } else {
-                                       if (yych == '\r') goto yy228;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy240;
+                                       if (yych == '\r') goto yy182;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy194;
                                }
                        } else {
                                if (yych <= '/') {
-                                       if (yych <= '"') goto yy228;
-                                       if (yych <= '%') goto yy182;
-                                       if (yych >= '*') goto yy182;
+                                       if (yych <= '"') goto yy182;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych >= '*') goto yy137;
                                } else {
-                                       if (yych <= '9') goto yy204;
-                                       if (yych != ';') goto yy182;
+                                       if (yych <= '9') goto yy160;
+                                       if (yych != ';') goto yy137;
                                }
                        }
                } else {
                        if (yych <= '_') {
                                if (yych <= 'N') {
-                                       if (yych <= '=') goto yy228;
-                                       if (yych <= '@') goto yy182;
-                                       if (yych <= 'M') goto yy204;
-                                       goto yy242;
+                                       if (yych <= '=') goto yy182;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych <= 'M') goto yy160;
+                                       goto yy196;
                                } else {
-                                       if (yych <= 'Z') goto yy204;
-                                       if (yych <= ']') goto yy182;
-                                       if (yych >= '_') goto yy204;
+                                       if (yych <= 'Z') goto yy160;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych >= '_') goto yy160;
                                }
                        } else {
                                if (yych <= 'z') {
-                                       if (yych <= '`') goto yy182;
-                                       if (yych == 'n') goto yy242;
-                                       goto yy204;
+                                       if (yych <= '`') goto yy137;
+                                       if (yych == 'n') goto yy196;
+                                       goto yy160;
                                } else {
                                        if (yych <= '|') {
-                                               if (yych <= '{') goto yy182;
+                                               if (yych <= '{') goto yy137;
                                        } else {
-                                               if (yych != '~') goto yy182;
+                                               if (yych != '~') goto yy137;
                                        }
                                }
                        }
                }
-yy228:
-               YYDEBUG(228, *YYCURSOR);
+yy182:
+               YYDEBUG(182, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 474 "Zend/zend_ini_scanner.l"
                { /* FALSE value (when used outside option value/offset this causes parse error!)*/
        RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-#line 3231 "Zend/zend_ini_scanner.c"
-yy229:
-               YYDEBUG(229, *YYCURSOR);
-               yyaccept = 4;
+#line 2753 "Zend/zend_ini_scanner.c"
+yy183:
+               YYDEBUG(183, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'L') goto yy243;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'L') goto yy197;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'l') goto yy243;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'l') goto yy197;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy230:
-               YYDEBUG(230, *YYCURSOR);
-               yyaccept = 4;
+yy184:
+               YYDEBUG(184, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'F') goto yy244;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'F') goto yy198;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'f') goto yy244;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'f') goto yy198;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy231:
-               YYDEBUG(231, *YYCURSOR);
-               yyaccept = 6;
+yy185:
+               YYDEBUG(185, *YYCURSOR);
+               yyaccept = 4;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yybm[0+yych] & 16) {
-                       goto yy204;
+               if (yybm[0+yych] & 32) {
+                       goto yy160;
                }
                if (yych <= ')') {
                        if (yych <= '\f') {
                                if (yych <= 0x08) {
-                                       if (yych >= 0x01) goto yy182;
+                                       if (yych >= 0x01) goto yy137;
                                } else {
-                                       if (yych <= '\t') goto yy245;
-                                       if (yych >= '\v') goto yy182;
+                                       if (yych <= '\t') goto yy199;
+                                       if (yych >= '\v') goto yy137;
                                }
                        } else {
                                if (yych <= ' ') {
-                                       if (yych <= '\r') goto yy232;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy245;
+                                       if (yych <= '\r') goto yy186;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy199;
                                } else {
-                                       if (yych <= '"') goto yy232;
-                                       if (yych <= '%') goto yy182;
+                                       if (yych <= '"') goto yy186;
+                                       if (yych <= '%') goto yy137;
                                }
                        }
                } else {
                        if (yych <= ']') {
                                if (yych <= ';') {
-                                       if (yych <= ':') goto yy182;
+                                       if (yych <= ':') goto yy137;
                                } else {
-                                       if (yych != '=') goto yy182;
+                                       if (yych != '=') goto yy137;
                                }
                        } else {
                                if (yych <= '|') {
-                                       if (yych <= '^') goto yy232;
-                                       if (yych <= '{') goto yy182;
+                                       if (yych <= '^') goto yy186;
+                                       if (yych <= '{') goto yy137;
                                } else {
-                                       if (yych != '~') goto yy182;
+                                       if (yych != '~') goto yy137;
                                }
                        }
                }
-yy232:
-               YYDEBUG(232, *YYCURSOR);
+yy186:
+               YYDEBUG(186, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 470 "Zend/zend_ini_scanner.l"
                { /* TRUE value (when used outside option value/offset this causes parse error!) */
        RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-#line 3382 "Zend/zend_ini_scanner.c"
-yy233:
-               YYDEBUG(233, *YYCURSOR);
-               yyaccept = 4;
+#line 2904 "Zend/zend_ini_scanner.c"
+yy187:
+               YYDEBUG(187, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'U') goto yy247;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'U') goto yy201;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'u') goto yy247;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'u') goto yy201;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy234:
-               YYDEBUG(234, *YYCURSOR);
-               yyaccept = 4;
+yy188:
+               YYDEBUG(188, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'S') goto yy231;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'S') goto yy185;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 's') goto yy231;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 's') goto yy185;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy235:
-               YYDEBUG(235, *YYCURSOR);
+yy189:
+               YYDEBUG(189, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(236, *YYCURSOR);
+               YYDEBUG(190, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy235;
+                       goto yy189;
                }
-               if (yych <= 0x00) goto yy183;
-               if (yych == '\\') goto yy216;
-               goto yy181;
-yy237:
-               YYDEBUG(237, *YYCURSOR);
+               if (yych <= 0x00) goto yy138;
+               if (yych == '\\') goto yy170;
+               goto yy136;
+yy191:
+               YYDEBUG(191, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(238, *YYCURSOR);
+               YYDEBUG(192, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 417 "Zend/zend_ini_scanner.l"
                { /* Raw string */
@@ -3507,335 +3029,554 @@ yy237:
        }
        RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 3511 "Zend/zend_ini_scanner.c"
-yy239:
-               YYDEBUG(239, *YYCURSOR);
-               yyaccept = 4;
+#line 3033 "Zend/zend_ini_scanner.c"
+yy193:
+               YYDEBUG(193, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'S') goto yy242;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'S') goto yy196;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 's') goto yy242;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 's') goto yy196;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy240:
-               YYDEBUG(240, *YYCURSOR);
+yy194:
+               YYDEBUG(194, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(241, *YYCURSOR);
-               if (yych == '\t') goto yy240;
-               if (yych == ' ') goto yy240;
-               goto yy228;
-yy242:
-               YYDEBUG(242, *YYCURSOR);
-               yyaccept = 4;
+               YYDEBUG(195, *YYCURSOR);
+               if (yych == '\t') goto yy194;
+               if (yych == ' ') goto yy194;
+               goto yy182;
+yy196:
+               YYDEBUG(196, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'E') goto yy244;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'E') goto yy198;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'e') goto yy244;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'e') goto yy198;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy243:
-               YYDEBUG(243, *YYCURSOR);
-               yyaccept = 4;
+yy197:
+               YYDEBUG(197, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'L') goto yy248;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'L') goto yy202;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'l') goto yy248;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'l') goto yy202;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy244:
-               YYDEBUG(244, *YYCURSOR);
-               yyaccept = 5;
+yy198:
+               YYDEBUG(198, *YYCURSOR);
+               yyaccept = 3;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yybm[0+yych] & 16) {
-                       goto yy204;
+               if (yybm[0+yych] & 32) {
+                       goto yy160;
                }
                if (yych <= ')') {
                        if (yych <= '\f') {
                                if (yych <= 0x08) {
-                                       if (yych <= 0x00) goto yy228;
-                                       goto yy182;
+                                       if (yych <= 0x00) goto yy182;
+                                       goto yy137;
                                } else {
-                                       if (yych <= '\t') goto yy240;
-                                       if (yych <= '\n') goto yy228;
-                                       goto yy182;
+                                       if (yych <= '\t') goto yy194;
+                                       if (yych <= '\n') goto yy182;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= ' ') {
-                                       if (yych <= '\r') goto yy228;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy240;
+                                       if (yych <= '\r') goto yy182;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy194;
                                } else {
-                                       if (yych <= '"') goto yy228;
-                                       if (yych <= '%') goto yy182;
-                                       goto yy228;
+                                       if (yych <= '"') goto yy182;
+                                       if (yych <= '%') goto yy137;
+                                       goto yy182;
                                }
                        }
                } else {
                        if (yych <= ']') {
                                if (yych <= ';') {
-                                       if (yych <= ':') goto yy182;
-                                       goto yy228;
-                               } else {
-                                       if (yych == '=') goto yy228;
+                                       if (yych <= ':') goto yy137;
                                        goto yy182;
+                               } else {
+                                       if (yych == '=') goto yy182;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '|') {
-                                       if (yych <= '^') goto yy228;
-                                       if (yych <= '{') goto yy182;
-                                       goto yy228;
-                               } else {
-                                       if (yych == '~') goto yy228;
+                                       if (yych <= '^') goto yy182;
+                                       if (yych <= '{') goto yy137;
                                        goto yy182;
+                               } else {
+                                       if (yych == '~') goto yy182;
+                                       goto yy137;
                                }
                        }
                }
-yy245:
-               YYDEBUG(245, *YYCURSOR);
+yy199:
+               YYDEBUG(199, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(246, *YYCURSOR);
-               if (yych == '\t') goto yy245;
-               if (yych == ' ') goto yy245;
-               goto yy232;
-yy247:
-               YYDEBUG(247, *YYCURSOR);
-               yyaccept = 4;
+               YYDEBUG(200, *YYCURSOR);
+               if (yych == '\t') goto yy199;
+               if (yych == ' ') goto yy199;
+               goto yy186;
+yy201:
+               YYDEBUG(201, *YYCURSOR);
+               yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '=') {
                        if (yych <= '"') {
                                if (yych <= '\n') {
-                                       if (yych <= 0x00) goto yy206;
-                                       if (yych <= 0x08) goto yy182;
-                                       goto yy206;
+                                       if (yych <= 0x00) goto yy162;
+                                       if (yych <= 0x08) goto yy137;
+                                       goto yy162;
                                } else {
-                                       if (yych == '\r') goto yy206;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy206;
+                                       if (yych == '\r') goto yy162;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy162;
                                }
                        } else {
                                if (yych <= '9') {
-                                       if (yych <= '%') goto yy182;
-                                       if (yych <= ')') goto yy206;
-                                       if (yych <= '/') goto yy182;
-                                       goto yy204;
+                                       if (yych <= '%') goto yy137;
+                                       if (yych <= ')') goto yy162;
+                                       if (yych <= '/') goto yy137;
+                                       goto yy160;
                                } else {
-                                       if (yych == ';') goto yy206;
-                                       if (yych <= '<') goto yy182;
-                                       goto yy206;
+                                       if (yych == ';') goto yy162;
+                                       if (yych <= '<') goto yy137;
+                                       goto yy162;
                                }
                        }
                } else {
                        if (yych <= '`') {
                                if (yych <= 'Z') {
-                                       if (yych <= '@') goto yy182;
-                                       if (yych == 'E') goto yy231;
-                                       goto yy204;
+                                       if (yych <= '@') goto yy137;
+                                       if (yych == 'E') goto yy185;
+                                       goto yy160;
                                } else {
-                                       if (yych <= ']') goto yy182;
-                                       if (yych <= '^') goto yy206;
-                                       if (yych <= '_') goto yy204;
-                                       goto yy182;
+                                       if (yych <= ']') goto yy137;
+                                       if (yych <= '^') goto yy162;
+                                       if (yych <= '_') goto yy160;
+                                       goto yy137;
                                }
                        } else {
                                if (yych <= '{') {
-                                       if (yych == 'e') goto yy231;
-                                       if (yych <= 'z') goto yy204;
-                                       goto yy182;
+                                       if (yych == 'e') goto yy185;
+                                       if (yych <= 'z') goto yy160;
+                                       goto yy137;
                                } else {
-                                       if (yych == '}') goto yy182;
-                                       if (yych <= '~') goto yy206;
-                                       goto yy182;
+                                       if (yych == '}') goto yy137;
+                                       if (yych <= '~') goto yy162;
+                                       goto yy137;
                                }
                        }
                }
-yy248:
-               YYDEBUG(248, *YYCURSOR);
-               yyaccept = 7;
+yy202:
+               YYDEBUG(202, *YYCURSOR);
+               yyaccept = 5;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yybm[0+yych] & 16) {
-                       goto yy204;
+               if (yybm[0+yych] & 32) {
+                       goto yy160;
                }
                if (yych <= ')') {
                        if (yych <= '\f') {
                                if (yych <= 0x08) {
-                                       if (yych >= 0x01) goto yy182;
+                                       if (yych >= 0x01) goto yy137;
                                } else {
-                                       if (yych <= '\t') goto yy250;
-                                       if (yych >= '\v') goto yy182;
+                                       if (yych <= '\t') goto yy204;
+                                       if (yych >= '\v') goto yy137;
                                }
                        } else {
                                if (yych <= ' ') {
-                                       if (yych <= '\r') goto yy249;
-                                       if (yych <= 0x1F) goto yy182;
-                                       goto yy250;
+                                       if (yych <= '\r') goto yy203;
+                                       if (yych <= 0x1F) goto yy137;
+                                       goto yy204;
+                               } else {
+                                       if (yych <= '"') goto yy203;
+                                       if (yych <= '%') goto yy137;
+                               }
+                       }
+               } else {
+                       if (yych <= ']') {
+                               if (yych <= ';') {
+                                       if (yych <= ':') goto yy137;
+                               } else {
+                                       if (yych != '=') goto yy137;
+                               }
+                       } else {
+                               if (yych <= '|') {
+                                       if (yych <= '^') goto yy203;
+                                       if (yych <= '{') goto yy137;
                                } else {
-                                       if (yych <= '"') goto yy249;
-                                       if (yych <= '%') goto yy182;
+                                       if (yych != '~') goto yy137;
+                               }
+                       }
+               }
+yy203:
+               YYDEBUG(203, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 478 "Zend/zend_ini_scanner.l"
+               {
+       RETURN_TOKEN(NULL_NULL, "", 0);
+}
+#line 3352 "Zend/zend_ini_scanner.c"
+yy204:
+               YYDEBUG(204, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               YYDEBUG(205, *YYCURSOR);
+               if (yych == '\t') goto yy204;
+               if (yych == ' ') goto yy204;
+               goto yy203;
+       }
+/* *********************************** */
+yyc_ST_SECTION_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,   0,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        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(206, *YYCURSOR);
+               YYFILL(1);
+               yych = *YYCURSOR;
+               if (yybm[0+yych] & 64) {
+                       goto yy208;
+               }
+               if (yych <= '\r') goto yy211;
+               goto yy213;
+yy208:
+               YYDEBUG(208, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(1);
+               yych = *YYCURSOR;
+               YYDEBUG(209, *YYCURSOR);
+               if (yybm[0+yych] & 64) {
+                       goto yy208;
+               }
+               YYDEBUG(210, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 545 "Zend/zend_ini_scanner.l"
+               { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+       RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 3423 "Zend/zend_ini_scanner.c"
+yy211:
+               YYDEBUG(211, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(212, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 656 "Zend/zend_ini_scanner.l"
+               {
+       return 0;
+}
+#line 3433 "Zend/zend_ini_scanner.c"
+yy213:
+               YYDEBUG(213, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(2);
+               yych = *YYCURSOR;
+               YYDEBUG(214, *YYCURSOR);
+               if (yybm[0+yych] & 128) {
+                       goto yy213;
+               }
+               if (yych <= 0x08) goto yy215;
+               if (yych <= '\n') goto yy216;
+               if (yych == '\r') goto yy217;
+yy215:
+               YYDEBUG(215, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 426 "Zend/zend_ini_scanner.l"
+               { /* End of section */
+       BEGIN(INITIAL);
+       SCNG(lineno)++;
+       return ']';
+}
+#line 3455 "Zend/zend_ini_scanner.c"
+yy216:
+               YYDEBUG(216, *YYCURSOR);
+               ++YYCURSOR;
+               goto yy215;
+yy217:
+               YYDEBUG(217, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy216;
+               goto yy215;
+       }
+/* *********************************** */
+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(218, *YYCURSOR);
+               YYFILL(2);
+               yych = *YYCURSOR;
+               if (yych == '"') goto yy222;
+               if (yych == '$') goto yy225;
+               YYDEBUG(220, *YYCURSOR);
+               ++YYCURSOR;
+yy221:
+               YYDEBUG(221, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 595 "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;
                                }
-                       }
-               } else {
-                       if (yych <= ']') {
-                               if (yych <= ';') {
-                                       if (yych <= ':') goto yy182;
-                               } else {
-                                       if (yych != '=') goto yy182;
+                               break;
+                       case '$':
+                               if (*YYCURSOR == '{') {
+                                       break;
                                }
-                       } else {
-                               if (yych <= '|') {
-                                       if (yych <= '^') goto yy249;
-                                       if (yych <= '{') goto yy182;
-                               } else {
-                                       if (yych != '~') goto yy182;
+                               continue;
+                       case '\\':
+                               if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {
+                                       YYCURSOR++;
                                }
-                       }
+                               /* fall through */
+                       default:
+                               continue;
                }
-yy249:
-               YYDEBUG(249, *YYCURSOR);
-               yyleng = YYCURSOR - SCNG(yy_text);
-#line 478 "Zend/zend_ini_scanner.l"
-               {
-       RETURN_TOKEN(NULL_NULL, "", 0);
+
+               YYCURSOR--;
+               break;
+       }
+
+       yyleng = YYCURSOR - SCNG(yy_text);
+
+       zend_ini_escape_string(ini_lval, yytext, yyleng, '"');
+       return TC_QUOTED_STRING;
 }
-#line 3830 "Zend/zend_ini_scanner.c"
-yy250:
-               YYDEBUG(250, *YYCURSOR);
+#line 3549 "Zend/zend_ini_scanner.c"
+yy222:
+               YYDEBUG(222, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(251, *YYCURSOR);
-               if (yych == '\t') goto yy250;
-               if (yych == ' ') goto yy250;
-               goto yy249;
+               YYDEBUG(223, *YYCURSOR);
+               if (yybm[0+yych] & 128) {
+                       goto yy222;
+               }
+               YYDEBUG(224, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 590 "Zend/zend_ini_scanner.l"
+               { /* Double quoted '"' string ends */
+       yy_pop_state();
+       return '"';
+}
+#line 3566 "Zend/zend_ini_scanner.c"
+yy225:
+               YYDEBUG(225, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych != '{') goto yy221;
+               YYDEBUG(226, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(227, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 450 "Zend/zend_ini_scanner.l"
+               { /* Variable start */
+       yy_push_state(ST_VARNAME);
+       return TC_DOLLAR_CURLY;
+}
+#line 3580 "Zend/zend_ini_scanner.c"
        }
 /* *********************************** */
 yyc_ST_VARNAME:
@@ -3874,24 +3615,24 @@ yyc_ST_VARNAME:
                        128, 128, 128, 128, 128, 128, 128, 128, 
                        128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(252, *YYCURSOR);
+               YYDEBUG(228, *YYCURSOR);
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 128) {
-                       goto yy254;
+                       goto yy230;
                }
-               if (yych == '}') goto yy259;
-               goto yy257;
-yy254:
-               YYDEBUG(254, *YYCURSOR);
+               if (yych == '}') goto yy235;
+               goto yy233;
+yy230:
+               YYDEBUG(230, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(255, *YYCURSOR);
+               YYDEBUG(231, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy254;
+                       goto yy230;
                }
-               YYDEBUG(256, *YYCURSOR);
+               YYDEBUG(232, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 455 "Zend/zend_ini_scanner.l"
                { /* Variable name */
@@ -3903,28 +3644,238 @@ yy254:
 
        RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
-#line 3907 "Zend/zend_ini_scanner.c"
-yy257:
-               YYDEBUG(257, *YYCURSOR);
+#line 3648 "Zend/zend_ini_scanner.c"
+yy233:
+               YYDEBUG(233, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(258, *YYCURSOR);
+               YYDEBUG(234, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 656 "Zend/zend_ini_scanner.l"
                {
        return 0;
 }
-#line 3917 "Zend/zend_ini_scanner.c"
-yy259:
-               YYDEBUG(259, *YYCURSOR);
+#line 3658 "Zend/zend_ini_scanner.c"
+yy235:
+               YYDEBUG(235, *YYCURSOR);
                ++YYCURSOR;
-               YYDEBUG(260, *YYCURSOR);
+               YYDEBUG(236, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
 #line 465 "Zend/zend_ini_scanner.l"
                { /* Variable end */
        yy_pop_state();
        return '}';
 }
-#line 3928 "Zend/zend_ini_scanner.c"
+#line 3669 "Zend/zend_ini_scanner.c"
+       }
+/* *********************************** */
+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(237, *YYCURSOR);
+               YYFILL(3);
+               yych = *YYCURSOR;
+               if (yych <= '\f') {
+                       if (yych <= 0x08) {
+                               if (yych >= 0x01) goto yy241;
+                       } else {
+                               if (yych <= '\t') goto yy243;
+                               if (yych <= '\n') goto yy244;
+                               goto yy241;
+                       }
+               } else {
+                       if (yych <= ' ') {
+                               if (yych <= '\r') goto yy246;
+                               if (yych <= 0x1F) goto yy241;
+                               goto yy243;
+                       } else {
+                               if (yych == ';') goto yy247;
+                               goto yy241;
+                       }
+               }
+               YYDEBUG(239, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(240, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 651 "Zend/zend_ini_scanner.l"
+               { /* End of option value (if EOF is reached before EOL */
+       BEGIN(INITIAL);
+       return END_OF_LINE;
+}
+#line 3738 "Zend/zend_ini_scanner.c"
+yy241:
+               YYDEBUG(241, *YYCURSOR);
+               ++YYCURSOR;
+yy242:
+               YYDEBUG(242, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 501 "Zend/zend_ini_scanner.l"
+               { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+       unsigned char *sc = NULL;
+       EAT_LEADING_WHITESPACE();
+       while (YYCURSOR < YYLIMIT) {
+               switch (*YYCURSOR) {
+                       case '\n':
+                       case '\r':
+                               goto end_raw_value_chars;
+                               break;
+                       case ';':
+                               if (sc == NULL) {
+                                       sc = YYCURSOR;
+                               }
+                               YYCURSOR++;
+                               break;
+                       case '"':
+                               if (yytext[0] == '"') {
+                                       sc = NULL;
+                               }
+                               YYCURSOR++;
+                               break;
+                       default:
+                               YYCURSOR++;
+                               break;
+               }
+       }
+end_raw_value_chars:
+       if (sc) {
+               yyleng = sc - SCNG(yy_text);
+       } else {
+               yyleng = YYCURSOR - SCNG(yy_text);
+       }
+
+       EAT_TRAILING_WHITESPACE();
+
+       /* Eat leading and trailing double quotes */
+       if (yyleng > 1 && yytext[0] == '"' && yytext[yyleng - 1] == '"') {
+               SCNG(yy_text)++;
+               yyleng = yyleng - 2;
+       }
+
+       RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+#line 3789 "Zend/zend_ini_scanner.c"
+yy243:
+               YYDEBUG(243, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych <= '\r') {
+                       if (yych <= 0x08) goto yy242;
+                       if (yych <= '\n') goto yy250;
+                       if (yych <= '\f') goto yy242;
+                       goto yy250;
+               } else {
+                       if (yych <= ' ') {
+                               if (yych <= 0x1F) goto yy242;
+                               goto yy250;
+                       } else {
+                               if (yych == ';') goto yy250;
+                               goto yy242;
+                       }
+               }
+yy244:
+               YYDEBUG(244, *YYCURSOR);
+               ++YYCURSOR;
+yy245:
+               YYDEBUG(245, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 549 "Zend/zend_ini_scanner.l"
+               { /* End of option value */
+       BEGIN(INITIAL);
+       SCNG(lineno)++;
+       return END_OF_LINE;
+}
+#line 3819 "Zend/zend_ini_scanner.c"
+yy246:
+               YYDEBUG(246, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy244;
+               goto yy245;
+yy247:
+               YYDEBUG(247, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(2);
+               yych = *YYCURSOR;
+               YYDEBUG(248, *YYCURSOR);
+               if (yybm[0+yych] & 64) {
+                       goto yy247;
+               }
+               if (yych <= '\n') goto yy252;
+               goto yy254;
+yy249:
+               YYDEBUG(249, *YYCURSOR);
+               ++YYCURSOR;
+               YYFILL(2);
+               yych = *YYCURSOR;
+yy250:
+               YYDEBUG(250, *YYCURSOR);
+               if (yybm[0+yych] & 128) {
+                       goto yy249;
+               }
+               if (yych <= '\f') {
+                       if (yych <= 0x08) goto yy251;
+                       if (yych <= '\n') goto yy244;
+               } else {
+                       if (yych <= '\r') goto yy246;
+                       if (yych == ';') goto yy247;
+               }
+yy251:
+               YYDEBUG(251, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 635 "Zend/zend_ini_scanner.l"
+               {
+       /* eat whitespace */
+       goto restart;
+}
+#line 3861 "Zend/zend_ini_scanner.c"
+yy252:
+               YYDEBUG(252, *YYCURSOR);
+               ++YYCURSOR;
+yy253:
+               YYDEBUG(253, *YYCURSOR);
+               yyleng = YYCURSOR - SCNG(yy_text);
+#line 645 "Zend/zend_ini_scanner.l"
+               { /* Comment */
+       BEGIN(INITIAL);
+       SCNG(lineno)++;
+       return END_OF_LINE;
+}
+#line 3874 "Zend/zend_ini_scanner.c"
+yy254:
+               YYDEBUG(254, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy252;
+               goto yy253;
        }
 }
 #line 660 "Zend/zend_ini_scanner.l"
index 1cbfbf1ce012a10d8df19a8f70dfc74f9df9f0e4..e446d7aeeab84ef2aaad3274ec448a02abb21b61 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 */
+/* Generated by re2c 1.0.3 */
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {