]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorJakub Zelenka <bukka@php.net>
Thu, 10 Jan 2019 20:16:06 +0000 (20:16 +0000)
committerJakub Zelenka <bukka@php.net>
Thu, 10 Jan 2019 20:16:06 +0000 (20:16 +0000)
1  2 
ext/openssl/tests/stream_crypto_flags_003.phpt

index 51a8dec123619060311cb5513492313de9d61c42,7e949a8a597b3261f7e21b12c0dbd7af05d6879f..4289dcc256f41b2ef424a591aa5b98f62368eebe
@@@ -11,10 -15,10 +15,10 @@@ $serverCode = <<<'CODE
      $serverUri = "ssl://127.0.0.1:64321";
      $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
      $serverCtx = stream_context_create(['ssl' => [
-         'local_cert' => __DIR__ . '/bug54992.pem',
+         'local_cert' => '%s',
  
          // Only accept TLSv1.2 connections
 -        'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_SERVER  | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER,
 +        'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_0_SERVER  | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER,
      ]]);
  
      $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
@@@ -49,7 -61,13 +61,13 @@@ $certificateGenerator->saveNewCertAsFil
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+ ?>
+ --CLEAN--
+ <?php
+ @unlink(__DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_003.pem.tmp');
+ @unlink(__DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_003-ca.pem.tmp');
+ ?>
  --EXPECTF--
  resource(%d) of type (stream)
 -bool(false)
 -bool(false)
 +resource(%d) of type (stream)
 +resource(%d) of type (stream)