]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfb2df5 a817465)
Merge branch 'PHP-5.4'
authorPierre Joye <pierre.php@gmail.com>
Tue, 27 Mar 2012 12:02:35 +0000 (14:02 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 27 Mar 2012 12:02:35 +0000 (14:02 +0200)
* PHP-5.4:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11

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

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