diff options
| author | Anatol Belski <ab@php.net> | 2014-11-24 16:27:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-24 16:27:43 +0100 |
| commit | 7582b57c87909da0bd3efbb3664c30df11274491 (patch) | |
| tree | eb0d78c9fc7acadc6aa601441ad2cd9ac56dab44 /ext/exif | |
| parent | 99818a576f0dd7fd5ef2869a27b62e1c3e5f48bd (diff) | |
| parent | 3578e5b25008157abd086e52ec1d179566359610 (diff) | |
| download | php-git-7582b57c87909da0bd3efbb3664c30df11274491.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in test
fork test for windows
update for LiteSpeed
update for LiteSpeed
Diffstat (limited to 'ext/exif')
| -rw-r--r-- | ext/exif/tests/bug68113.phpt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/exif/tests/bug68113.phpt b/ext/exif/tests/bug68113.phpt index 0fa4c4aca8..e4a1cbf53b 100644 --- a/ext/exif/tests/bug68113.phpt +++ b/ext/exif/tests/bug68113.phpt @@ -10,8 +10,8 @@ var_dump(exif_thumbnail(__DIR__."/bug68113.jpg")); ?> Done --EXPECTF-- -Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s/bug68113.php on line 2 +Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s%ebug68113.php on line 2 -Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s/bug68113.php on line 2 +Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s%ebug68113.php on line 2 bool(false) -Done
\ No newline at end of file +Done |