From: Nuno Lopes <nlopess@php.net>
Date: Mon, 2 Feb 2009 19:25:30 +0000 (+0000)
Subject: MFB: fix #46347
X-Git-Tag: php-5.4.0alpha1~191^2~4342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e2aa6f979e1b8c8d3c1a16c66d44ba39cdba0de;p=php

MFB: fix #46347
---

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 364c6e2297..8e28618ae5 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -309,7 +309,7 @@ NEWLINE	("\r"|"\n"|"\r\n")
 TABS_AND_SPACES [ \t]
 WHITESPACE [ \t]+
 CONSTANT [a-zA-Z][a-zA-Z0-9_]*
-LABEL [a-zA-Z0-9_][a-zA-Z0-9._-]*
+LABEL [a-zA-Z0-9_][a-zA-Z0-9*._-]*
 TOKENS [:,.\[\]"'()|^&+-/*=%$!~<>?@{}]
 OPERATORS [&|~()!]
 DOLLAR_CURLY "${"
diff --git a/ext/standard/tests/file/bug46347.phpt b/ext/standard/tests/file/bug46347.phpt
new file mode 100644
index 0000000000..903a6e35cc
--- /dev/null
+++ b/ext/standard/tests/file/bug46347.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #46347 (parse_ini_file() doesn't support * in keys)
+--FILE--
+<?php
+
+$str = <<< EOF
+[section]
+part1.*.part2 = 1
+EOF;
+
+$file = __DIR__ . '/parse.ini';
+file_put_contents($file, $str);
+
+var_dump(parse_ini_file($file));
+?>
+--CLEAN--
+<?php
+unlink(__DIR__.'/parse.ini');
+?>
+--EXPECT--
+array(1) {
+  ["part1.*.part2"]=>
+  string(1) "1"
+}