summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-06-06 08:58:08 +0200
committerAnatol Belski <ab@php.net>2016-06-06 08:58:08 +0200
commit174c3371bd8004d27d6c0548afea5ff6f479e2a4 (patch)
treef25e2a4f4f7c790c301875e514bd8f65441f8765
parent075c75873e73fbc6d1b2124690cdd3628365d570 (diff)
parenteaef8f6db2f80cf49dc5886454ed5789121e889e (diff)
downloadphp-git-174c3371bd8004d27d6c0548afea5ff6f479e2a4.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: fix typo
-rw-r--r--ext/openssl/tests/openssl_error_string_basic.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt
index fdda537689..7f39f70621 100644
--- a/ext/openssl/tests/openssl_error_string_basic.phpt
+++ b/ext/openssl/tests/openssl_error_string_basic.phpt
@@ -5,7 +5,7 @@ openssl_error_string() tests
if (!extension_loaded("openssl")) print "skip";
//if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSLv1.0.1 required");
?>
--XFAIL--
+--XFAIL--
ot ready baked yet, fails different ways on different envs
--FILE--
<?php