diff options
| author | Remi Collet <remi@php.net> | 2016-01-20 13:10:56 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2016-01-20 13:10:56 +0100 |
| commit | e58cf4f9966b21f06d79044f6be69cfd5fd55a23 (patch) | |
| tree | 04c49e68f34ecd10021dd4d659119b6ee115f190 | |
| parent | 98164714eacf22a56ecd3a991bea22a486f0bcc8 (diff) | |
| parent | 3c8f287d5837f357605184cccd004de017b9f5b4 (diff) | |
| download | php-git-e58cf4f9966b21f06d79044f6be69cfd5fd55a23.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
| -rw-r--r-- | ext/standard/tests/streams/stream_socket_enable_crypto.phpt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt index e316096525..f282c8455b 100644 --- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt +++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt @@ -5,7 +5,7 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p --SKIPIF-- <?php if (phpversion() < "5.3.0") { die('SKIP php version so lower.'); } -if (!extension_loaded('openssl')) { die('ext/openssl required'); } +if (!extension_loaded('openssl')) { die('skip ext/openssl required'); } if(substr(PHP_OS, 0, 3) == 'WIN' ) { die('skip not for windows'); } @@ -18,8 +18,8 @@ $sock = stream_socket_server($serverUri, $errno, $errstr); if (is_resource($sock)) { var_dump(stream_socket_enable_crypto($sock, false)); var_dump(stream_socket_enable_crypto($sock, true)); - var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)); + var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_SERVER)); @@ -43,10 +43,10 @@ bool(false) Warning: stream_socket_enable_crypto(): When enabling encryption you must specify the crypto type in %s on line %d bool(false) -Warning: stream_socket_enable_crypto(): SSLv2 %s in %s on line %d +Warning: stream_socket_enable_crypto(): SSL: Broken pipe in %s on line %d bool(false) -Warning: stream_socket_enable_crypto(): SSL: Broken pipe in %s on line %d +Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream 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 |