diff options
| author | Anatol Belski <ab@php.net> | 2013-12-11 13:32:49 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-12-11 13:32:49 +0100 |
| commit | ff89066b3d52c2e124b8e893ccca3147f40e2061 (patch) | |
| tree | 502aa101baec7ffd4f6c42f072b6b26f5cbd81ef | |
| parent | 8f1fee61e2f0c24fd46d0ecbc6ded5c68bae7d6e (diff) | |
| parent | 6f739318fd3dc04a01aec762d449949db481bf5d (diff) | |
| download | php-git-ff89066b3d52c2e124b8e893ccca3147f40e2061.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix dir separator in cve-2013-6420 test
| -rw-r--r-- | ext/openssl/tests/cve-2013-6420.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/tests/cve-2013-6420.phpt b/ext/openssl/tests/cve-2013-6420.phpt index b946cf0dd9..87c0210b2e 100644 --- a/ext/openssl/tests/cve-2013-6420.phpt +++ b/ext/openssl/tests/cve-2013-6420.phpt @@ -12,7 +12,7 @@ var_dump($info['issuer']['emailAddress'], $info["validFrom_time_t"]); ?> Done --EXPECTF-- -%s openssl_x509_parse(): illegal ASN1 data type for timestamp in %s/cve-2013-6420.php on line 3 +%s openssl_x509_parse(): illegal ASN1 data type for timestamp in %s%ecve-2013-6420.php on line 3 string(27) "stefan.esser@sektioneins.de" int(-1) Done |