Merge branch 'PHP-7.1'

diff --cc ext/session/tests/bug60860.phpt
index a9c7507b31cf9bd5d0dfcd8858256f10a0f6c698,83185862f01f02e92189f6d18e674dff0c17b5dd..38a3796b68632cc0e78ccd790a84162f4ea47f59
--- 1/ext/session/tests/bug60860.phpt
--- 2/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@@ -1,15 -1,9 +1,12 @@@
  --TEST--
  Bug #60860 (session.save_handler=user without defined function core dumps)
  --SKIPIF--
 -<?php include('skipif.inc'); ?>
 +<?php
 +include('skipif.inc');
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip not for Windows');
- }
 +?>
  --INI--
  session.save_handler=user
 +display_errors=off
  --FILE--
  <?php
  

diff --cc ext/session/tests/bug66481.phpt
index 280c0b2420b191deb911952e7901f71e53519b31,cf6ad6a8d6673fe17bda43bd538c7747356840df..c75cb88d1c404dd8a2cc33d9b806dcd61a27195c
--- 1/ext/session/tests/bug66481.phpt
--- 2/ext/session/tests/bug66481.phpt
+++ b/ext/session/tests/bug66481.phpt
@@@ -4,10 -4,8 +4,9 @@@ Bug #66481: Calls to session_name() seg
  session.name=
  --SKIPIF--
  <?php include('skipif.inc'); ?>
- <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?>
  --FILE--
  <?php
 +ob_start();
  
  var_dump(session_name("foo"));
  var_dump(session_name("bar"));

diff --cc ext/session/tests/session_set_save_handler_class_014.phpt
index 1b06cd0b648cce5e1c5a02ffc2baf24f0df8212a,ea62beb0ff57eff2aec7ed93214f14229839372c..ba689cef02c0179697a4423316cb42ee8afa3ccf
--- 1/ext/session/tests/session_set_save_handler_class_014.phpt
--- 2/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@@ -3,14 -3,8 +3,11 @@@ Test session_set_save_handler() : calli
  --INI--
  session.save_handler=user
  session.name=PHPSESSID
 +display_errors=off
  --SKIPIF--
 -<?php include('skipif.inc'); ?>
 +<?php
 +include('skipif.inc');
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip not for Windows');
- }
 +?>
  --FILE--
  <?php
  

diff --cc main/main.c
Simple merge

diff --cc sapi/cli/php_cli.c
Simple merge