com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/apprentice.c
| From: | Anatol Belski | Date: | Thu, 22 Jan 2015 09:17:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/libmagic/apprentice.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84309@lists.php.net to get a copy of this message | ||
Commit: 60c2621b2a9a82f0a31988aa58a3be9192184bdf
Author: Anatol Belski <ab@php.net> Thu, 22 Jan 2015 10:17:14 +0100
Parents: a2e83332b96b69a6b512ff65200aae9f30258ebf 43652d386a753c0a280790525e3593ecb416793c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60c2621b2a9a82f0a31988aa58a3be9192184bdf
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
simplify error handling for dirs as magic
Changed paths:
MM ext/fileinfo/libmagic/apprentice.c
Diff: