From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 18 Jun 2020 13:55:23 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5f5da421109e1578dabcc88272d985a706c4b51;p=php

Merge branch 'PHP-7.4'
---

b5f5da421109e1578dabcc88272d985a706c4b51
diff --cc ext/openssl/tests/stream_security_level.phpt
index ebb21c5d1a,a377101c37..44ba4c6d57
--- a/ext/openssl/tests/stream_security_level.phpt
+++ b/ext/openssl/tests/stream_security_level.phpt
@@@ -18,16 -18,19 +18,19 @@@ $certFile = __DIR__ . DIRECTORY_SEPARAT
  $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_security_level-ca.pem.tmp';
  
  $serverCode = <<<'CODE'
 -	$serverUri = "ssl://127.0.0.1:64322";
 -	$serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
 -	$serverCtx = stream_context_create(['ssl' => [
 -		'local_cert' => '%s',
 -		// Make sure the server side starts up successfully if the default security level is
 -		// higher. We want to test the error at the client side.
 -		'security_level' => 1,
 -	]]);
 +    $serverUri = "ssl://127.0.0.1:64322";
 +    $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
 +    $serverCtx = stream_context_create(['ssl' => [
-         'local_cert' => '%s'
++        'local_cert' => '%s',
++        // Make sure the server side starts up successfully if the default security level is
++        // higher. We want to test the error at the client side.
++        'security_level' => 1,
 +    ]]);
  
 -	$server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
 -	phpt_notify();
 +    $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
 +    phpt_notify();
  
 -	@stream_socket_accept($server, 1);
 +    @stream_socket_accept($server, 1);
  CODE;
  $serverCode = sprintf($serverCode, $certFile);