com php-src: Fix incorrect error suppressing in openssl_error _string test: ext/openssl/tests/openssl_error_strin g_basic.phpt
| From: | Jakub Zelenka | Date: | Thu, 16 Jun 2016 19:11:02 +0000 |
| Subject: | com php-src: Fix incorrect error suppressing in openssl_error _string test: ext/openssl/tests/openssl_error_strin g_basic.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92411@lists.php.net to get a copy of this message | ||
Commit: 0c34f53c93d65ef4741a9c6493f84a13ab68cb72
Author: Jakub Zelenka <bukka@php.net> Thu, 16 Jun 2016 20:11:02 +0100
Parents: 84948e63820fad817b526168531c62fc33a6c13f
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0c34f53c93d65ef4741a9c6493f84a13ab68cb72
Log:
Fix incorrect error suppressing in openssl_error_string test
Changed paths:
M ext/openssl/tests/openssl_error_string_basic.phpt
Diff:
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt
b/ext/openssl/tests/openssl_error_string_basic.phpt
index 76bc2d5..82f3099 100644
--- a/ext/openssl/tests/openssl_error_string_basic.phpt
+++ b/ext/openssl/tests/openssl_error_string_basic.phpt
@@ -128,8 +128,8 @@ echo "CSR errors\n";
@openssl_csr_get_subject("file://" . $invalid_file_for_read);
expect_openssl_errors('openssl_csr_get_subject open', ['02001002',
'2006D080', '20068079', '0906D06C']);
// file or str csr is not correct PEM - failing PEM_read_bio_X509_REQ
-openssl_csr_get_subject($crt_file);
-@expect_openssl_errors('openssl_csr_get_subjec pem', ['0906D06C']);
+@openssl_csr_get_subject($crt_file);
+expect_openssl_errors('openssl_csr_get_subjec pem', ['0906D06C']);
// other possible cuases that are difficult to catch:
// - ASN1_STRING_to_UTF8 fails in add_assoc_name_entry