diff options
| author | Remi Collet <remi@remirepo.net> | 2018-09-11 11:53:51 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-09-11 11:53:51 +0200 |
| commit | a1dbb57fb367a407ace5513fb71a1382dbbca319 (patch) | |
| tree | 07b51ab8b8c65270a296d99ac2e2bb93a1e57fe5 /be50a72715c141befe6f34ece660745da894aaf3.patch | |
| parent | a5f424e1ad9b11333036e7463b84eb7ff102167d (diff) | |
Update to 7.2.10 - http://www.php.net/releases/7_2_10.php
Diffstat (limited to 'be50a72715c141befe6f34ece660745da894aaf3.patch')
| -rw-r--r-- | be50a72715c141befe6f34ece660745da894aaf3.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/be50a72715c141befe6f34ece660745da894aaf3.patch b/be50a72715c141befe6f34ece660745da894aaf3.patch new file mode 100644 index 0000000..2bcf82d --- /dev/null +++ b/be50a72715c141befe6f34ece660745da894aaf3.patch @@ -0,0 +1,37 @@ +From be50a72715c141befe6f34ece660745da894aaf3 Mon Sep 17 00:00:00 2001 +From: Jakub Zelenka <bukka@php.net> +Date: Sun, 9 Sep 2018 18:53:37 +0100 +Subject: [PATCH] Fix ssl stream reneg limit test to print only after first + renegotiation + +It has been reported that in some setup the test does multiple +renegotiations which is allowed. +--- + ext/openssl/tests/stream_server_reneg_limit.phpt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/ext/openssl/tests/stream_server_reneg_limit.phpt b/ext/openssl/tests/stream_server_reneg_limit.phpt +index f0353351a23a..f033cbabe343 100644 +--- a/ext/openssl/tests/stream_server_reneg_limit.phpt ++++ b/ext/openssl/tests/stream_server_reneg_limit.phpt +@@ -22,14 +22,18 @@ if(substr(PHP_OS, 0, 3) == 'WIN') { + */ + + $serverCode = <<<'CODE' ++ $printed = false; + $serverUri = "ssl://127.0.0.1:64321"; + $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN; + $serverCtx = stream_context_create(['ssl' => [ + 'local_cert' => __DIR__ . '/bug54992.pem', + 'reneg_limit' => 0, + 'reneg_window' => 30, +- 'reneg_limit_callback' => function($stream) { +- var_dump($stream); ++ 'reneg_limit_callback' => function($stream) use (&$printed) { ++ if (!$printed) { ++ $printed = true; ++ var_dump($stream); ++ } + } + ]]); + |