diff options
| author | Remi Collet <remi@remirepo.net> | 2019-03-22 15:15:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-03-22 15:15:24 +0100 |
| commit | b205a783ed8822505df0208b55eaec085d1bf1b5 (patch) | |
| tree | 0382337a227a086b16b9f0d6eaca2cc5960c02a2 | |
| parent | b2217f1c90bd998fd9fe6174a5945091320f755b (diff) | |
more upstream patch
| -rw-r--r-- | php-upstream.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch index d121d26..5b118a7 100644 --- a/php-upstream.patch +++ b/php-upstream.patch @@ -1349,3 +1349,48 @@ index 000000000000..95596800d690 +2147483647 +string(10) "2147483647" +===DONE=== +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,10 +1,16 @@ + --TEST-- + ini_get_all() tests + --INI-- ++pcre.jit=1 + pcre.backtrack_limit=1000000 + pcre.recursion_limit=100000 + --SKIPIF-- + <?php if (!extension_loaded("reflection")) die("skip"); ?> ++<?php ++if (ini_get("pcre.jit") === FALSE) { ++ die("skip no jit built"); ++} ++?> + --FILE-- + <?php + |