diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-03-28 17:13:16 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-03-28 17:13:16 +0200 |
| commit | fa0d507923b8dc07ff91576121543b18549dda3a (patch) | |
| tree | c4d72553e7c731552f70fb439ba8515b52ad1ab5 | |
| parent | 4c5b427124a2af3d951fed869cc86452e8b6290c (diff) | |
| parent | bff8152565375c863f67833b73e2629c4d50cf63 (diff) | |
| download | php-git-fa0d507923b8dc07ff91576121543b18549dda3a.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61401 ext\openssl\tests\004.phpt fails
Fix bug #61404 ext\openssl\tests\021.phpt fails
Fix bug #61448 intl tests fail with icu >= 4.8
| -rw-r--r-- | ext/openssl/tests/004.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/tests/004.phpt b/ext/openssl/tests/004.phpt index c6c7e874cf..508ccabc85 100644 --- a/ext/openssl/tests/004.phpt +++ b/ext/openssl/tests/004.phpt @@ -9,12 +9,12 @@ $a = 1; var_dump(openssl_csr_new(1,$a)); var_dump(openssl_csr_new(1,$a,1,1)); $a = array(); -var_dump(openssl_csr_new(array(), $a, array(), array())); +var_dump(openssl_csr_new(array(), $a, array('config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'), array())); //this leaks $a = array(1,2); $b = array(1,2); -var_dump(openssl_csr_new($a, $b)); +var_dump(openssl_csr_new($a, $b, array('config' => __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf'))); echo "Done\n"; |