From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Jan 2017 20:13:41 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~689^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52da05c535152bf88ee52f4f00847113584ac791;p=php

Merge branch 'PHP-7.1'
---

52da05c535152bf88ee52f4f00847113584ac791
diff --cc ext/session/tests/bug60860.phpt
index a9c7507b31,83185862f0..38a3796b68
--- a/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 280c0b2420,cf6ad6a8d6..c75cb88d1c
--- a/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 1b06cd0b64,ea62beb0ff..ba689cef02
--- a/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