com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/readcdf.c
| From: | Anatol Belski | Date: | Thu, 24 Apr 2014 17:33:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/readcdf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77134@lists.php.net to get a copy of this message | ||
Commit: 74ce9da5dcaa31a50bb2395df6200b191fdc0e41
Author: Anatol Belski <ab@php.net> Thu, 24 Apr 2014 19:33:54 +0200
Parents: cd2641973cbd665301739593a291a1fa78a05578 03fa5501a84af2bda7d81c732d46d2a68ee0e855
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74ce9da5dcaa31a50bb2395df6200b191fdc0e41
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
Bugs:
https://bugs.php.net/66307
Changed paths:
MM ext/fileinfo/libmagic/readcdf.c
Diff: