diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-14 17:37:10 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-14 17:37:10 +0200 |
| commit | 49e91151c0ac1e39caab14c2d323dc70acb723c0 (patch) | |
| tree | 0f5e2eb3609ef75aba54db36aa31df499d15a815 | |
| parent | 80912569488dacef806db6be11494f0064f5a1b8 (diff) | |
| parent | e1c610fb44385cd2894be1957cc32f7cccc4b476 (diff) | |
| download | php-git-49e91151c0ac1e39caab14c2d323dc70acb723c0.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rwxr-xr-x | ext/exif/tests/bug60150.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt index 63cf0a9daf..be01998fd8 100755 --- a/ext/exif/tests/bug60150.phpt +++ b/ext/exif/tests/bug60150.phpt @@ -12,7 +12,7 @@ var_dump(exif_read_data($infile)); ?> ===DONE=== --EXPECTF-- -Warning: exif_read_data(bug60150.jpg): Process tag(x9003=DateTimeOri): Illegal pointer offset(x%x + x%x = x%x > x%x) in %s on line %d +Warning: exif_read_data(bug60150.jpg): Process tag(x9003=DateTimeOri): Illegal pointer offset(%s) in %s on line %d Warning: exif_read_data(bug60150.jpg): Error reading from file: got=x%x(=%d) != itemlen-%d=x%x(=%d) in %s on line %d |