com php-src: fix test warnings for OpenSSL 1.1: ext/standard/te sts/streams/stream_socket_enable_crypto-win32.phpt
| From: | Anatol Belski | Date: | Wed, 22 Mar 2017 12:55:08 +0000 |
| Subject: | com php-src: fix test warnings for OpenSSL 1.1: ext/standard/te sts/streams/stream_socket_enable_crypto-win32.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97369@lists.php.net to get a copy of this message | ||
Commit: 6dbee20f83224292b061042dd3a59d68ba9882b7
Author: Anatol Belski <ab@php.net> Wed, 22 Mar 2017 12:23:19 +0100
Parents: ba64ec0b1331697bd71e70bf20c9a5c3c3c02136
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6dbee20f83224292b061042dd3a59d68ba9882b7
Log:
fix test warnings for OpenSSL 1.1
add skip condition
Changed paths:
M ext/standard/tests/streams/stream_socket_enable_crypto-win32.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 7353ee4..994b3f6 100644
--- a/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt
+++ b/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt
@@ -10,6 +10,7 @@ if (!extension_loaded('openssl')) {
if (substr(PHP_OS, 0, 3) != 'WIN' ) {
die('skip windows only test');
}
+if (OPENSSL_VERSION_NUMBER < 0x10001001) die("skip OpenSSLv1.0.1 required");
?>
--FILE--
<?php
@@ -47,11 +48,11 @@ bool(false)
Warning: stream_socket_enable_crypto(): SSLv2 unavailable in this PHP version in %s on line %d
bool(false)
-Warning: stream_socket_enable_crypto(): SSL: A request to send or receive data was disallowed
because the socket is not connected and (when sending on a datagram socket using a sendto call) no
address was supplied.
- in %s on line %d
+Warning: stream_socket_enable_crypto(): SSLv3 unavailable %s in %s on line %d
bool(false)
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
+Warning: stream_socket_enable_crypto(): SSL: The operation completed successfully.
+ in %s on line %d
bool(false)
Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d