com php-src: Fixed bug #76833, backport change to stream_sock et_enable_crypto-win32.phpt from 7.3: e
xt/standard/tests/streams/stream_socket_enable_crypto-win 32.phpt ext/standard/tests/streams/stream_socket_en able_crypto.phpt

From: Date: Tue, 04 Sep 2018 08:53:35 +0000
Subject: com php-src: Fixed bug #76833, backport change to stream_sock et_enable_crypto-win32.phpt from 7.3: e
xt/standard/tests/streams/stream_socket_enable_crypto-win 32.phpt ext/standard/tests/streams/stream_socket_en able_crypto.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102987@lists.php.net to get a copy of this message
Commit: 2476fb76a75cf71b2d27070f1daeeb1ea4058096 Author: Anatol Belski <ab@php.net> Tue, 4 Sep 2018 10:51:14 +0200 Parents: edec566d9b431259e8cd7a6cb1737d32234e1c6e Branches: PHP-7.2 PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2476fb76a75cf71b2d27070f1daeeb1ea4058096 Log: Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3 It would probably be better to remove this test as it's too much maintanance for a little gain. Bugs: https://bugs.php.net/76833 Changed paths: D 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 deleted file mode 100644 index 1ae61b5..0000000 --- a/ext/standard/tests/streams/stream_socket_enable_crypto-win32.phpt +++ /dev/null @@ -1,71 +0,0 @@ ---TEST-- -mixed stream_socket_enable_crypto(resource $stream , bool $enable [, int $crypto_type [, resource $session_stream ]] ) ; ---CREDITS-- -marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (!extension_loaded('openssl')) { - die('skip ext openssl required'); -} -if (substr(PHP_OS, 0, 3) != 'WIN' ) { - die('skip windows only test'); -} -if (OPENSSL_VERSION_NUMBER < 0x10100000) die("skip OpenSSLv1.1.0 required"); -?> ---FILE-- -<?php -$serverUri = "tcp://127.0.0.1:31854"; -$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_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)); - var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_SERVER)); - var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER)); - var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_SERVER)); -} else { - die("Test stream_socket_enable_crypto has failed; Unable to connect: {$errstr} ({$errno})"); -} -?> ---CLEAN-- -<?php -unset($serverUri); -unset($sock); -unset($errno); -unset($errstr); -?> ---EXPECTF-- -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 unavailable in this PHP version in %s on line %d -bool(false) - -Warning: stream_socket_enable_crypto(): SSLv3 unavailable %s in %s on line %d -bool(false) - -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 -bool(false) - -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 -bool(false) - -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 -bool(false) diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt index 6791e7a..3e1aedc 100644 --- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt +++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt @@ -7,9 +7,6 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p if (!extension_loaded('openssl')) { die('skip ext/openssl required'); } -if(substr(PHP_OS, 0, 3) == 'WIN' ) { - die('skip not for windows'); -} ?> --FILE-- <?php @@ -44,7 +41,7 @@ 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(): SSL: Broken pipe in %s on line %d +Warning: stream_socket_enable_crypto(): SSL: %a 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

« previous php.cvs (#102987) next »