From 665bd988becc3e850c6ef1e3144dbe3467239d69 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 14 Mar 2017 18:29:04 +0100
Subject: PHP 7.1.3

---
 php-upstream.patch | 57 ------------------------------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 php-upstream.patch

(limited to 'php-upstream.patch')

diff --git a/php-upstream.patch b/php-upstream.patch
deleted file mode 100644
index c1e0abf..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3006d1de5b1b2903af3ad1e8c72c3cfe6cd1af15 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 28 Feb 2017 11:36:24 +0100
-Subject: [PATCH] make test slower again
-
----
- Zend/tests/bug74093.phpt | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt
-index 22c78a6..7f20285 100644
---- a/Zend/tests/bug74093.phpt
-+++ b/Zend/tests/bug74093.phpt
-@@ -1,20 +1,20 @@
----TEST--
--Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
----SKIPIF--
--<?php
--if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
--if (PHP_ZTS) die("skip only for no-zts build");
--if (substr(PHP_OS, 0, 3) == 'WIN') die("skip not for Windows");
--?>
----INI--
--memory_limit=1G
--max_execution_time=1
--hard_timeout=1
----FILE--
--<?php
--$a1 = range(1, 1000000);
--$a2 = range(100000, 999999);
--array_intersect($a1, $a2);
--?>
----EXPECTF--
--Fatal error: Maximum execution time of 1+1 seconds exceeded %s
-+--TEST--
-+Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
-+--SKIPIF--
-+<?php
-+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-+if (PHP_ZTS) die("skip only for no-zts build");
-+if (substr(PHP_OS, 0, 3) == 'WIN') die("skip not for Windows");
-+?>
-+--INI--
-+memory_limit=1G
-+max_execution_time=1
-+hard_timeout=1
-+--FILE--
-+<?php
-+$a1 = range(1, 1000000);
-+$a2 = range(100000, 1999999);
-+array_intersect($a1, $a2);
-+?>
-+--EXPECTF--
-+Fatal error: Maximum execution time of 1+1 seconds exceeded %s
--- 
-2.1.4
-
-- 
cgit