Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug #61401 ext\openssl\tests\004.phpt fails
  Fix bug #61404 ext\openssl\tests\021.phpt fails
  Fix bug #61404 ext\openssl\tests\021.phpt fails
  Fix bug #61448 intl tests fail with icu >= 4.8
  • Loading branch information...
commit 40bbc7a1ed999d7cc98e656a6956e4d861d744a5 2 parents b905167 + fa0d507
Anatol Belski weltling authored

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. +2 2 ext/openssl/tests/004.phpt
4 ext/openssl/tests/004.phpt
@@ -9,12 +9,12 @@ $a = 1;
9 9 var_dump(openssl_csr_new(1,$a));
10 10 var_dump(openssl_csr_new(1,$a,1,1));
11 11 $a = array();
12   -var_dump(openssl_csr_new(array(), $a, array(), array()));
  12 +var_dump(openssl_csr_new(array(), $a, array('config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'), array()));
13 13
14 14 //this leaks
15 15 $a = array(1,2);
16 16 $b = array(1,2);
17   -var_dump(openssl_csr_new($a, $b));
  17 +var_dump(openssl_csr_new($a, $b, array('config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf')));
18 18
19 19
20 20 echo "Done\n";

0 comments on commit 40bbc7a

Please sign in to comment.
Something went wrong with that request. Please try again.