From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 26 Jan 2016 08:22:31 +0000 (+0800)
Subject: Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
X-Git-Tag: php-7.2.0alpha1~620^2~69^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6239e4410d87466125372ca81f712e19baba45e4;p=php

Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
---

diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt
index 2f78f4a4b5..c61e93d038 100644
--- a/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt
+++ b/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt
@@ -4,9 +4,10 @@ mixed stream_socket_enable_crypto(resource $stream , bool $enable [, int $crypto
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
 <?php
-if (phpversion() < "5.3.0") { die('SKIP php version so lower.'); }
-if (!extension_loaded('openssl')) { die('ext/openssl required'); }
-if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+if (!extension_loaded('openssl')) {
+	die('skip ext openssl required');
+}
+if (substr(PHP_OS, 0, 3) != 'WIN' ) {
 	die('skip windows only test');
 }
 ?>
diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
index f282c8455b..e7ee3e5b3b 100644
--- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
+++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
@@ -4,8 +4,9 @@ mixed stream_socket_enable_crypto(resource $stream , bool $enable [, int $crypto
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
 <?php
-if (phpversion() < "5.3.0") { die('SKIP php version so lower.'); }
-if (!extension_loaded('openssl')) { die('skip ext/openssl required'); }
+if (!extension_loaded('openssl')) {
+	die('skip ext/openssl required');
+}
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
 	die('skip not for windows');
 }