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 /cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch | |
| parent | a5f424e1ad9b11333036e7463b84eb7ff102167d (diff) | |
Update to 7.2.10 - http://www.php.net/releases/7_2_10.php
Diffstat (limited to 'cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch')
| -rw-r--r-- | cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch b/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch new file mode 100644 index 0000000..0cb89c8 --- /dev/null +++ b/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch @@ -0,0 +1,38 @@ +From cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a Mon Sep 17 00:00:00 2001 +From: Jakub Zelenka <bukka@php.net> +Date: Sun, 2 Sep 2018 20:00:08 +0100 +Subject: [PATCH] Fix stream_security_level.phpt with OpenSSL 1.1.1 + +--- + ext/openssl/tests/stream_security_level.phpt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt +index fb1d36a58624..26fedcf670e9 100644 +--- a/ext/openssl/tests/stream_security_level.phpt ++++ b/ext/openssl/tests/stream_security_level.phpt +@@ -5,6 +5,7 @@ security_level setting to prohibit cert + if (!extension_loaded("openssl")) die("skip openssl not loaded"); + if (OPENSSL_VERSION_NUMBER < 0x10100000) die("skip OpenSSL >= v1.1.0 required"); + if (!function_exists("proc_open")) die("skip no proc_open"); ++?> + --FILE-- + <?php + $serverCode = <<<'CODE' +@@ -24,7 +25,7 @@ $clientCode = <<<'CODE' + $serverUri = "ssl://127.0.0.1:64322"; + $clientFlags = STREAM_CLIENT_CONNECT; + $clientCtx = stream_context_create(['ssl' => [ +- 'security_level' => 3, ++ 'security_level' => 2, + 'verify_peer' => true, + 'cafile' => __DIR__ . '/bug54992-ca.pem', + 'verify_peer_name' => false +@@ -38,6 +39,7 @@ CODE; + + include 'ServerClientTestCase.inc'; + ServerClientTestCase::getInstance()->run($clientCode, $serverCode); ++?> + --EXPECTF-- + Warning: stream_socket_client(): SSL operation failed with code 1. OpenSSL Error messages: + error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed in %s : eval()'d code on line %d |