Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Fixed bug #73172 parse error: Invalid numeric literal
xuenru · Sep 26, 2016 · 4e37463 · 4e37463
2 parents 5e24fe9 + 39e5991
commit 4e37463
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Zend/zend_strtod_int.h b/Zend/zend_strtod_int.h
@@ -64,8 +64,8 @@ typedef unsigned long int uint32_t;
 # endif
 #endif
 
-#ifdef HAVE_LOCALE_H
-#define USE_LOCALE 1
+#ifdef USE_LOCALE
+#undef USE_LOCALE
 #endif
 
 #ifdef WORDS_BIGENDIAN

diff --git a/tests/lang/bug73172.inc b/tests/lang/bug73172.inc
@@ -0,0 +1,7 @@
+<?php
+
+function test($a, $x, $y){
+  return;
+}
+test('test', 9223372036854775808, 'test');
+
diff --git a/tests/lang/bug73172.phpt b/tests/lang/bug73172.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #73172 parse error: Invalid numeric literal
+--FILE--
+<?php
+
+setlocale(LC_ALL, 'fr_FR.utf8', 'fra');
+
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug73172.inc";
+
+?>
+==DONE==
+--EXPECTF--
+==DONE==