diff options
| author | Remi Collet <remi@php.net> | 2019-03-22 15:01:49 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-03-22 15:01:49 +0100 |
| commit | bb47fb0783f4c928684c1fd7e56afd9d8fa132fc (patch) | |
| tree | 2989a1ee95d7e3dce9a812416659f1abe1983860 | |
| parent | 30ddfd49edbd8066cc0a18a557e3de30c2397d12 (diff) | |
| parent | 2e9dccef78d169be9a4a37c813e0b5d624bd5ac7 (diff) | |
| download | php-git-bb47fb0783f4c928684c1fd7e56afd9d8fa132fc.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
ensure pcre.jit=1 for these tests
| -rw-r--r-- | ext/pcre/tests/preg_match_error3.phpt | 3 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/ini_get_all.phpt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/pcre/tests/preg_match_error3.phpt b/ext/pcre/tests/preg_match_error3.phpt index 2e91e24466..8b9d59fc58 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 a90a6e83d2..ca450f1bc4 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-- |