com php-src: Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled): ext/standard/tests/streams/stream_socke
t_enable_crypto-win32.phpt ext/standard/tests/strea ms/stream_socket_enable_crypto.phpt
| From: | Xinchen Hui | Date: | Tue, 26 Jan 2016 08:22:31 +0000 |
| Subject: | com php-src: Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled): ext/standard/tests/streams/stream_socke t_enable_crypto-win32.phpt ext/standard/tests/strea ms/stream_socket_enable_crypto.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90761@lists.php.net to get a copy of this message | ||
Commit: 6239e4410d87466125372ca81f712e19baba45e4
Author: Xinchen Hui <laruence@gmail.com> Tue, 26 Jan 2016 16:22:31 +0800
Parents: bdbb32158cb5dba960503aa30709aba0b9979a49
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6239e4410d87466125372ca81f712e19baba45e4
Log:
Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
Bugs:
https://bugs.php.net/71439
Changed paths:
M ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt
M ext/standard/tests/streams/stream_socket_enable_crypto.phpt
Diff:
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 2f78f4a..c61e93d 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 f282c84..e7ee3e5 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');
}