From: Anatoliy Belsky <ab@php.net>
Date: Tue, 27 Mar 2012 13:23:01 +0000 (+0200)
Subject: Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
X-Git-Tag: php-5.4.1RC1~17^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e55718b09121c79f3a6b0cfb7c446112fb378402;p=php

Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
---

diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt
index 771fc932fe..2bedeb2d67 100644
--- a/ext/openssl/tests/bug28382.phpt
+++ b/ext/openssl/tests/bug28382.phpt
@@ -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/"