]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2493a3 da399ce)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:05:02 +0000 (14:05 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:05:02 +0000 (14:05 +0200)
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size

1  2 
ext/fileinfo/libmagic/softmagic.c patch | diff1 | diff2 | blob | history

diff --cc ext/fileinfo/libmagic/softmagic.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.