com php-src: Raise timeout to 2s, reworded ssl timeout warning: ext/openssl/tests/bug46127.phpt ext/openssl/tests/bug54992.phpt
ext/openssl/tests/bug65729.phpt ext/openssl/tests/openssl_pee r_fingerprint.phpt ext/openssl/tests/session_meta_cap ture.phpt
ext/openssl/tests/stream_crypto_flags_0 02.phpt ext/openssl/tests/stream_verify_peer_name _002.phpt ext/openssl/xp_ssl.c

Commit: 020e161966db1603f28df9baa33141ae59067243 Author: datibbaw <datibbaw@php.net> Tue, 4 Mar 2014 11:02:18 +0800 Committer: Daniel Lowrey <rdlowrey@php.net> Wed, 5 Mar 2014 10:03:23 -0700 Parents: 27849c998a77a093449dec4b051dfc266d5123ec Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=020e161966db1603f28df9baa33141ae59067243 Log: Raise timeout to 2s, reworded ssl timeout warning Changed paths: M ext/openssl/tests/bug46127.phpt M ext/openssl/tests/bug54992.phpt M ext/openssl/tests/bug65729.phpt M ext/openssl/tests/openssl_peer_fingerprint.phpt M ext/openssl/tests/session_meta_capture.phpt M ext/openssl/tests/stream_crypto_flags_002.phpt M ext/openssl/tests/stream_verify_peer_name_002.phpt M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt index 80bd61c..5410d2f 100644 --- a/ext/openssl/tests/bug46127.phpt +++ b/ext/openssl/tests/bug46127..phpt @@ -31,7 +31,7 @@ $clientCode = <<<'CODE' ]]); phpt_wait(); - $sock = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); + $sock = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx); echo fgets($sock); CODE; diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index bcb33fd..878cb4a 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -29,7 +29,7 @@ $clientCode = <<<'CODE' ]]); phpt_wait(); - $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); + $client = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx); var_dump($client); CODE; diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index b405b72..347dc55 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -36,7 +36,7 @@ $clientCode = <<<'CODE' 'peer_name' => $expected_name, ]]); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); } CODE; diff --git a/ext/openssl/tests/openssl_peer_fingerprint.phpt b/ext/openssl/tests/openssl_peer_fingerprint.phpt index 0bd91d5..7f48cb4 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint.phpt @@ -34,12 +34,12 @@ $clientCode = <<<'CODE' // should be: 81cafc260aa8d82956ebc6212a362ecc stream_context_set_option($clientCtx, 'ssl', 'peer_fingerprint', '81cafc260aa8d82956ebc6212a362ece'); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); stream_context_set_option($clientCtx, 'ssl', 'peer_fingerprint', [ 'sha256' => '78ea579f2c3b439359dec5dac9d445108772927427c4780037e87df3799a0aa0', ]); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); CODE; include 'ServerClientTestCase.inc'; diff --git a/ext/openssl/tests/session_meta_capture.phpt b/ext/openssl/tests/session_meta_capture.phpt index 62cdffe..1e5e1e6 100644 --- a/ext/openssl/tests/session_meta_capture.phpt +++ b/ext/openssl/tests/session_meta_capture.phpt @@ -51,7 +51,7 @@ $clientCode = <<<'CODE' var_dump($meta['protocol']); stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT); - stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); + stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx); $meta = stream_context_get_options($clientCtx)['ssl']['session_meta']; var_dump($meta['protocol']); CODE; diff --git a/ext/openssl/tests/stream_crypto_flags_002.phpt b/ext/openssl/tests/stream_crypto_flags_002.phpt index b72b4d6..e57f2b7 100644 --- a/ext/openssl/tests/stream_crypto_flags_002.phpt +++ b/ext/openssl/tests/stream_crypto_flags_002.phpt @@ -35,16 +35,16 @@ $clientCode = <<<'CODE' phpt_wait(); stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLS_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); + var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx)); CODE; include 'ServerClientTestCase.inc'; diff --git a/ext/openssl/tests/stream_verify_peer_name_002.phpt b/ext/openssl/tests/stream_verify_peer_name_002.phpt index ae97ea1..cfee8b1 100644 --- a/ext/openssl/tests/stream_verify_peer_name_002.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_002.phpt @@ -29,7 +29,7 @@ $clientCode = <<<'CODE' ]]); phpt_wait(); - $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); + $client = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx); var_dump($client); CODE; diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 6d7f8e9..ad3d92d 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1480,7 +1480,7 @@ static int php_openssl_enable_crypto(php_stream *stream, if (elapsed_time.tv_sec > timeout->tv_sec || (elapsed_time.tv_sec == timeout->tv_sec && elapsed_time.tv_usec > timeout->tv_usec)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL: crypto enabling timeout"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL: Handshake timed out"); return -1; } }