com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/softmagic.c
| From: | Remi Collet | Date: | Tue, 10 Jun 2014 12:05:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78795@lists.php.net to get a copy of this message | ||
Commit: 5e7cb43890cebbd82bf8c951b1db0e9417931f5a
Author: Remi Collet <remi@php.net> Tue, 10 Jun 2014 14:05:02 +0200
Parents: e2493a3a084102db5119cd3402eda0352d88017f da399ce6a8ebea05e80de6c176f479ef5a6961c8
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e7cb43890cebbd82bf8c951b1db0e9417931f5a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
Bugs:
https://bugs.php.net/67410
Changed paths:
MM ext/fileinfo/libmagic/softmagic.c
Diff: