diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-22 16:57:17 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-22 16:57:17 -0700 |
| commit | aca526a13b8fa9b3444906a18c3e20a7d2672d94 (patch) | |
| tree | 202248786d719b7b3eb962e5ec62feffb7eecd48 /ext/phar/tests | |
| parent | dafb2af705d0e6c4c747ecf4b3f7cf8e25454dd0 (diff) | |
| parent | 61499bf28252f7bea040395721178bb1a41365b9 (diff) | |
| download | php-git-aca526a13b8fa9b3444906a18c3e20a7d2672d94.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
Diffstat (limited to 'ext/phar/tests')
| -rw-r--r-- | ext/phar/tests/create_path_error.phpt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 7451d9cd39..886ba81925 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -34,6 +34,8 @@ $checks = array( "\xF0\x9F\x98\x8D.ttf", // valid 4 byte char - smiling face with heart-shaped eyes "Font\xE9\xBBpro.ttf", //Invalid multi-byte character - missing last byte "Font\xBB\x91pro.ttf", //Invalid multi-byte character - missing first byte + "Font\xC0\xAFpro.ttf", //Invalid multi-byte character - invalid first byte + "Font\xF0\x80\x90\x90pro.ttf", //Invalid multi-byte character - surrogate pair code point "\xFC\x81\x81\x81\x81pro.ttf", //RFC 3629 limited char points to 0000-10FFFF aka 5 byte utf-8 not valid ); foreach($checks as $check) @@ -76,6 +78,8 @@ string(5) "query" 9:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character 10:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character 11:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character +12:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character +13:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character Exception: Entry a does not exist and cannot be created: phar error: invalid path "a" contains illegal character ===DONE=== |