com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/openssl/tests/004.phpt

Commit: fa0d507923b8dc07ff91576121543b18549dda3a Author: Anatoliy Belsky <ab@php.net> Wed, 28 Mar 2012 17:13:16 +0200 Parents: 4c5b427124a2af3d951fed869cc86452e8b6290c bff8152565375c863f67833b73e2629c4d50cf63 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa0d507923b8dc07ff91576121543b18549dda3a Log: 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 Bugs: https://bugs.php.net/61401 https://bugs.php.net/61404 https://bugs.php.net/61448 Changed paths: MM ext/openssl/tests/004.phpt Diff: fa0d507923b8dc07ff91576121543b18549dda3a diff --combined ext/openssl/tests/004.phpt index c6c7e87,aca9818..508ccab --- a/ext/openssl/tests/004.phpt +++ b/ext/openssl/tests/004.phpt @@@ -9,12 -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"; @@@ -28,7 -28,7 +28,7 @@@ NUL Warning: openssl_csr_new(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d -Warning: openssl_csr_new(): add1_attr_by_txt challengePassword_min -> 4 (failed) in %s on line %d +Warning: openssl_csr_new(): add1_attr_by_txt challengePassword_min -> 4 (failed; check error queue and value of string_mask OpenSSL option if illegal characters are reported) in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509 CSR) Done