summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2020-03-03 13:06:46 +0100
committerRemi Collet <remi@php.net>2020-03-03 13:06:46 +0100
commitef03236d9d1fd3558f70d8920f88b13fb525fed3 (patch)
treed038f5d8478c18e0c69717888329fc76dee3ae05
parentec03689eb9582ea168b0592eddc435443d7b640c (diff)
parentb093bd6ae82e796cdc395238d30afc2721805287 (diff)
downloadphp-git-ef03236d9d1fd3558f70d8920f88b13fb525fed3.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: this test needs json
-rw-r--r--ext/pcre/tests/bug79241.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pcre/tests/bug79241.phpt b/ext/pcre/tests/bug79241.phpt
index f6dbb8bea4..de89e19760 100644
--- a/ext/pcre/tests/bug79241.phpt
+++ b/ext/pcre/tests/bug79241.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #79241: Segmentation fault on preg_match()
+--SKIPIF--
+<?php if (!extension_loaded("json")) print "skip json extension missing"; ?>
--FILE--
<?php