Raise timeout to 2s, reworded ssl timeout warning

diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt
index 80bd61c287c01286ed10f5aa60d010804f96ca68..5410d2f87e8b19b4087ea3ee8faef732289ff9b7 100644 (file)
--- 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 bcb33fdd8aec7375d79820fc96e89eb2e8852c8c..878cb4a8725b373a8d97d14b86e8d6a2786c3667 100644 (file)
--- 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 b405b7213d6ecfcf12dfb57d0830bb0aa13f0a3d..347dc55e758cbc4c1ea19148b2174aabe674f217 100644 (file)
--- 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 0bd91d543a0852c80634154dc708af14caebd16e..7f48cb4546b969f9481a53f6ce3a71ef4885412b 100644 (file)
--- 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 62cdffe6860932ad2e6078ca65294e455d148446..1e5e1e67ee50e8bfeae6c50ca853c476b02c5a00 100644 (file)
--- 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 b72b4d62f29fb72562405ddd39383e5ff2e6ae79..e57f2b7069874192f945808e6cc1ed8e96029200 100644 (file)
--- 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 ae97ea1269766878df6b3e3ab293b4739c35bea7..cfee8b1c07ab4052c3f9c0d922deb1ae27d59acb 100644 (file)
--- 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 6d7f8e94a7d45864cf537850ad387b012acc84f5..ad3d92d0dc690011057b15bcab18a3a63e4d31ed 100644 (file)
--- 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;
                                }
                        }