Permalink
Browse files

Merge branch '5.4'

* 5.4:
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
  • Loading branch information...
2 parents 63e58b6 + 5f3ba55 commit 686effc6776f10c8b3192a4da84ccf06649955f4 @weltling weltling committed Mar 27, 2012
Showing with 6 additions and 3 deletions.
  1. +6 −3 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/"

0 comments on commit 686effc

Please sign in to comment.