summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2015-04-17 15:21:03 +0200
committerRemi Collet <remi@php.net>2015-04-17 15:21:03 +0200
commit9340c5b347b84ca3201b2cb5b113250b988d30f0 (patch)
tree9bc31c1e42db814a41ec44b4b27851087653228d
parente74b84a9fe36791e514454148e622f56815ac925 (diff)
parent342acbe1c6f1c01ef994cd1084165967fc6618a7 (diff)
downloadphp-git-9340c5b347b84ca3201b2cb5b113250b988d30f0.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: skip test when xml not available
-rw-r--r--ext/openssl/tests/bug68912.phpt1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/openssl/tests/bug68912.phpt b/ext/openssl/tests/bug68912.phpt
index 7d763db8e9..c18291a6ec 100644
--- a/ext/openssl/tests/bug68912.phpt
+++ b/ext/openssl/tests/bug68912.phpt
@@ -3,6 +3,7 @@ Bug #68912 (Segmentation fault at openssl_spki_new)
--SKIPIF--
<?php
if (!extension_loaded("openssl")) die("skip");
+if (!extension_loaded("xml")) die("skip xml extension not loaded");
if (!@openssl_pkey_new()) die("skip cannot create private key");
?>
--FILE--