From: Jakub Zelenka <bukka@php.net>
Date: Thu, 21 Jun 2018 15:50:45 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha3~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f349b728e2a8864f6bc49f97014c2fc97619827;p=php

Merge branch 'PHP-7.2'
---

5f349b728e2a8864f6bc49f97014c2fc97619827
diff --cc ext/openssl/tests/bug36732.phpt
index 83aa302100,5c1b70724d..72ca6904a9
--- a/ext/openssl/tests/bug36732.phpt
+++ b/ext/openssl/tests/bug36732.phpt
@@@ -33,9 -32,9 +32,9 @@@ if (strpos($str, 'Requested Extensions:
  }
  openssl_x509_export($crt, $str, false);
  if (strpos($str, 'X509v3 extensions:')) {
- 	echo "Ok\n";
+     echo "Ok\n";
  }
  ?>
 ---EXPECTF--
 +--EXPECT--
  Ok
  Ok
diff --cc ext/openssl/tests/bug39217.phpt
index 8bafedbab4,ad64058a56..47f234d769
--- a/ext/openssl/tests/bug39217.phpt
+++ b/ext/openssl/tests/bug39217.phpt
@@@ -9,11 -9,11 +9,11 @@@ if (!extension_loaded("openssl")) die("
  $dir = dirname(__FILE__);
  $certs = array('bug39217cert2.txt', 'bug39217cert1.txt');
  foreach($certs as $cert) {
- 	$res = openssl_x509_parse(file_get_contents($dir . '/' . $cert));
- 	print_r($res['serialNumber']);
- 	echo "\n";
+     $res = openssl_x509_parse(file_get_contents($dir . '/' . $cert));
+     print_r($res['serialNumber']);
+     echo "\n";
  }
  ?>
 ---EXPECTF--
 +--EXPECT--
  163040343498260435477161879008842183802
  15
diff --cc ext/openssl/tests/bug48182.phpt
index e528b43cad,d11cddf273..dcadaaa6b9
--- a/ext/openssl/tests/bug48182.phpt
+++ b/ext/openssl/tests/bug48182.phpt
@@@ -44,7 -44,8 +44,8 @@@ echo "Running bug48182\n"
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+ ?>
 ---EXPECTF--
 +--EXPECT--
  Running bug48182
  Sending bug48182
  Sending data over to SSL server in async mode with contents like Hello World
diff --cc ext/openssl/tests/bug65538_003.phpt
index 80280d1e15,042e7d08bc..0597ceaef9
--- a/ext/openssl/tests/bug65538_003.phpt
+++ b/ext/openssl/tests/bug65538_003.phpt
@@@ -49,5 -50,6 +50,6 @@@ CODE
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+ ?>
 ---EXPECTF--
 +--EXPECT--
  string(12) "Hello World!"
diff --cc ext/openssl/tests/bug66501.phpt
index daf7cb6aa0,3994ebdc3c..34dac6d44a
--- a/ext/openssl/tests/bug66501.phpt
+++ b/ext/openssl/tests/bug66501.phpt
@@@ -18,5 -19,6 +19,6 @@@ sqOTOnMoezkbSmVVMuwz9flvnqHGmQvmug=
  $key = openssl_pkey_get_private($pkey);
  $res = openssl_sign($data ='alpha', $sign, $key, 'SHA1');
  var_dump($res);
+ ?>
 ---EXPECTF--
 +--EXPECT--
  bool(true)
diff --cc ext/openssl/tests/bug67403.phpt
index 19701af381,76c5c8613c..add6c09d72
--- a/ext/openssl/tests/bug67403.phpt
+++ b/ext/openssl/tests/bug67403.phpt
@@@ -14,7 -13,8 +13,8 @@@ $r = openssl_x509_parse(file_get_conten
  var_dump($r['signatureTypeSN']);
  var_dump($r['signatureTypeLN']);
  var_dump($r['signatureTypeNID']);
+ ?>
 ---EXPECTF--
 +--EXPECT--
  string(8) "RSA-SHA1"
  string(21) "sha1WithRSAEncryption"
  int(65)
diff --cc ext/openssl/tests/cve2013_4073.phpt
index a626e21f95,d1ba849ba6..c88021b0ae
--- a/ext/openssl/tests/cve2013_4073.phpt
+++ b/ext/openssl/tests/cve2013_4073.phpt
@@@ -8,8 -7,8 +7,9 @@@ CVE 2013-4073: Null-byte certificate ha
  $cert = file_get_contents(__DIR__ . '/cve2013_4073.pem');
  $info = openssl_x509_parse($cert);
  var_export($info['extensions']);
 +
+ ?>
 ---EXPECTF--
 +--EXPECT--
  array (
    'basicConstraints' => 'CA:FALSE',
    'subjectKeyIdentifier' => '88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C',
diff --cc ext/openssl/tests/session_meta_capture.phpt
index 76182e17d5,caa3a87075..733bde82ae
--- a/ext/openssl/tests/session_meta_capture.phpt
+++ b/ext/openssl/tests/session_meta_capture.phpt
@@@ -53,7 -53,8 +53,8 @@@ CODE
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+ ?>
 ---EXPECTF--
 +--EXPECT--
  string(5) "TLSv1"
  string(7) "TLSv1.1"
  string(7) "TLSv1.2"
diff --cc ext/openssl/tests/streams_crypto_method.phpt
index 15d0598e0f,19d08f38a3..3816aa1195
--- a/ext/openssl/tests/streams_crypto_method.phpt
+++ b/ext/openssl/tests/streams_crypto_method.phpt
@@@ -49,5 -49,6 +49,6 @@@ CODE
  
  include 'ServerClientTestCase.inc';
  ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+ ?>
 ---EXPECTF--
 +--EXPECT--
  Hello World!