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