From 6282f71b35eb4013c391dbff5e38780c1d43a31d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 22 Mar 2019 15:40:29 +0100
Subject: more upstream patch

---
 php-upstream.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/php-upstream.patch b/php-upstream.patch
index db01840..6d95d13 100644
--- a/php-upstream.patch
+++ b/php-upstream.patch
@@ -1382,3 +1382,62 @@ index 695f0c1e81b5..6511c715e11e 100644
 -Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset %d in %smatch_flags3.php on line %d
 +Warning: preg_match(): Compilation failed: %s name must start with a non-digit at offset %d in %smatch_flags3.php on line %d
  bool(false)
+From 2e9dccef78d169be9a4a37c813e0b5d624bd5ac7 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Fri, 22 Mar 2019 15:00:31 +0100
+Subject: [PATCH] ensure pcre.jit=1 for these tests
+
+---
+ ext/pcre/tests/preg_match_error3.phpt                 | 3 +++
+ ext/standard/tests/general_functions/ini_get_all.phpt | 6 ++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/ext/pcre/tests/preg_match_error3.phpt b/ext/pcre/tests/preg_match_error3.phpt
+index 2e91e24466ba..8b9d59fc58bd 100644
+--- a/ext/pcre/tests/preg_match_error3.phpt
++++ b/ext/pcre/tests/preg_match_error3.phpt
+@@ -5,6 +5,9 @@ Test preg_match() function : error conditions - jit stacklimit exhausted
+ if (ini_get("pcre.jit") === FALSE) {
+ 	die("skip no jit built");
+ }
++?>
++--INI--
++pcre.jit=1
+ --FILE--
+ <?php
+ var_dump(preg_match('/^(foo)+$/', str_repeat('foo', 1024*8192)));
+diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt
+index b97a945ee588..72ce86deaad4 100644
+--- a/ext/standard/tests/general_functions/ini_get_all.phpt
++++ b/ext/standard/tests/general_functions/ini_get_all.phpt
+@@ -1,6 +1,7 @@
+ --TEST--
+ ini_get_all() tests
+ --INI--
++pcre.jit=1
+ pcre.backtrack_limit=1000000
+ pcre.recursion_limit=100000
+ --SKIPIF--
+ 
+From e68fd40e22e695e17d94da24a1c0ca0087a61898 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Fri, 22 Mar 2019 15:31:36 +0100
+Subject: [PATCH] ensure pcre.jit=1 for this test
+
+---
+ ext/pcre/tests/grep2.phpt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt
+index a739cb60ac3b..4c6f9b155f26 100644
+--- a/ext/pcre/tests/grep2.phpt
++++ b/ext/pcre/tests/grep2.phpt
+@@ -2,6 +2,8 @@
+ preg_grep() 2nd test
+ --SKIPIF--
+ <?php if (!PCRE_JIT_SUPPORT) die("skip no pcre jit support"); ?>
++--INI--
++pcre.jit=1
+ --FILE--
+ <?php
+ 
-- 
cgit