diff options
| author | Anatol Belski <ab@php.net> | 2018-09-12 16:24:38 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-09-12 16:24:38 +0200 |
| commit | 05a4fec76119696ec50b920ec783cca5e6eca31c (patch) | |
| tree | 618189f670456d931b269270cc527fa7888f54be | |
| parent | aed32f2a03cb2464e976bc08cd22c100c7978b2a (diff) | |
| parent | 19ab91781ed48db3f3bf171f0687f7b4b2a037e1 (diff) | |
| download | php-git-05a4fec76119696ec50b920ec783cca5e6eca31c.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Improve error code matching
| -rw-r--r-- | ext/openssl/tests/openssl_error_string_basic.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt index 0f1acd7dc5..af8f81f842 100644 --- a/ext/openssl/tests/openssl_error_string_basic.phpt +++ b/ext/openssl/tests/openssl_error_string_basic.phpt @@ -8,8 +8,8 @@ openssl_error_string() tests function expect_openssl_errors($name, $expected_error_codes) { $expected_errors = array_fill_keys($expected_error_codes, false); while (($error_string = openssl_error_string()) !== false) { - if (strlen($error_string) > 14) { - $error_code = substr($error_string, 6, 8); + if (preg_match(",.+:([0-9A-F]+):.+,", $error_string, $m) > 0) { + $error_code = $m[1]; if (isset($expected_errors[$error_code])) { $expected_errors[$error_code] = true; } |