1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00

Merge branch '5.4'

* 5.4:
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
This commit is contained in:
Anatoliy Belsky
2012-03-27 15:34:57 +02:00
+6 -3
View File
@@ -10,6 +10,11 @@ if (OPENSSL_VERSION_NUMBER<0x009070af) die("skip");
$cert = file_get_contents(dirname(__FILE__) . "/bug28382cert.txt");
$ext = openssl_x509_parse($cert);
var_dump($ext['extensions']);
/* openssl 1.0 prepends the string "Full Name:" to the crlDistributionPoints array key.
For now, as this is the one difference only between 0.9.x and 1.x, it's handled with
placeholders to not to duplicate the test. When more diffs come, a duplication would
be probably a better solution.
*/
?>
--EXPECTF--
array(11) {
@@ -20,9 +25,7 @@ array(11) {
["nsCertType"]=>
string(30) "SSL Client, SSL Server, S/MIME"
["crlDistributionPoints"]=>
string(65) "
Full Name:
URI:http://mobile.blue-software.ro:90/ca/crl.shtml
string(%d) "%AURI:http://mobile.blue-software.ro:90/ca/crl.shtml
"
["nsCaPolicyUrl"]=>
string(38) "http://mobile.blue-software.ro:90/pub/"