Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

Author: johannes

.appveyor.yml

@@ -23,7 +23,7 @@ environment:
  PHP_BUILD_CACHE_BASE_DIR: c:\build-cache 
  PHP_BUILD_OBJ_DIR: c:\obj
  PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
- PHP_BUILD_SDK_BRANCH: php-sdk-2.1.3
+ PHP_BUILD_SDK_BRANCH: php-sdk-2.1.5
  # ext and env setup for tests
  #MYSQL_TEST_PASSWD: Password12!
  #MYSQL_TEST_USER: root

.gdbinit

@@ -16,9 +16,11 @@ define ____executor_globals
 end
 set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
+set $eg_ptr = $eg
 else
 set $eg = executor_globals
 set $cg = compiler_globals
+set $eg_ptr = (zend_executor_globals*) &executor_globals
 end
 end
 
@@ -289,6 +291,16 @@ define ____printzv
 end
 end
 
+define print_global_vars
+____executor_globals
+set $symtable = ((HashTable *)&($eg_ptr->symbol_table))
+print_ht $symtable
+end
+
+document print_global_vars
+Prints the global variables
+end
+
 define print_const_table
 set $ind = 1
 printf "[%p] {\n", $arg0

NEWS

@@ -2,7 +2,23 @@ PHP NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.1.19
 
+- CLI Server:
+ . Fixed bug #76333 (PHP built-in server does not find files if root path
+ contains special characters). (Anatol)
+
+- OpenSSL:
+ . Fixed bug #76296 (openssl_pkey_get_public does not respect open_basedir).
+ (Erik Lax, Jakub Zelenka)
+ . Fixed bug #76174 (openssl extension fails to build with LibreSSL 2.7).
+ (Jakub Zelenka)
 
+- SPL:
+ . Fixed bug #76367 (NoRewindIterator segfault 11). (Laruence)
+
+- Standard:
+ . Fixed bug #76335 ("link(): Bad file descriptor" with non-ASCII path).
+ (Anatol)
+ . Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT). (Bob)
 
 24 May 2018, PHP 7.1.18
 

Zend/tests/bug76383.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #76383: array_map on $GLOBALS returns IS_INDIRECT
+--FILE--
+<?php
+
+$a = 1;
+array_map(function($x) use (&$lastval) { $lastval = $x; }, $GLOBALS);
+var_dump(gettype($lastval), $lastval); // will contain $a
+
+?>
+--EXPECT--
+string(7) "integer"
+int(1)

ext/bcmath/tests/bug72093-win32.phpt

@@ -6,6 +6,11 @@ if(!extension_loaded("bcmath")) print "skip";
 if (substr(PHP_OS, 0, 3) != 'WIN') {
  die('skip valid only for windows');
 }
+$cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD;
+$req = "10.0.17134";
+if (version_compare($cur, $req) >= 0) {
+echo "skip Only for Windows systems < $req";
+}
 ?>
 --FILE--
 <?php
@@ -14,5 +19,4 @@ var_dump(bcpowmod(1, 1.2, 1, 1));
 ?>
 --EXPECTF--
 string(1) "1"
-string(3) "0.0"
-bc math warning: non-zero scale in exponent
+%Astring(3) "0.0"%A

ext/bcmath/tests/bug72093.phpt

@@ -4,7 +4,11 @@ Bug 72093: bcpowmod accepts negative scale and corrupts _one_ definition
 <?php
 if(!extension_loaded("bcmath")) print "skip";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip Not valid for windows');
+$cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD;
+$req = "10.0.17134";
+if (version_compare($cur, $req) < 0) {
+echo "skip Compatible on Windows systems >= $req";
+}
 }
 ?>
 --FILE--

ext/bcmath/tests/bug75178-win32.phpt

@@ -6,16 +6,19 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
 if (substr(PHP_OS, 0, 3) != 'WIN') {
  die('skip valid only for windows');
 }
+$cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD;
+$req = "10.0.17134";
+if (version_compare($cur, $req) >= 0) {
+echo "skip Only for Windows systems < $req";
+}
 ?>
 --FILE--
 <?php
 var_dump(bcpowmod('4.1', '4', '3', 3));
 var_dump(bcpowmod('4', '4', '3.1', 3));
 ?>
 ===DONE===
---EXPECT--
-string(5) "1.000"
-string(5) "1.000"
-===DONE===
-bc math warning: non-zero scale in base
-bc math warning: non-zero scale in modulus
+--EXPECTF--
+%Astring(5) "1.000"
+%Astring(5) "1.000"
+===DONE===%A

ext/bcmath/tests/bug75178.phpt

@@ -4,7 +4,11 @@ Bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
 <?php
 if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
 if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip Not valid for windows');
+$cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD;
+$req = "10.0.17134";
+if (version_compare($cur, $req) < 0) {
+echo "skip Compatible on Windows systems >= $req";
+}
 }
 ?>
 --FILE--

ext/curl/tests/bug48203-win32.phpt

@@ -30,7 +30,8 @@ echo "Ok\n";
 <?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?>
 --EXPECTF--
 Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d
-Hello World!
-Hello World!Ok
 %A
+Hello World!
+Hello World!* Closing connection 0
+Ok
 

ext/curl/tests/bug54798-win32.phpt

@@ -65,4 +65,3 @@ Hello World!Ok for CURLOPT_FILE
 
 %AOk for CURLOPT_INFILE
 ===DONE===
-%A