Permalink
Browse files

Merge branch 'master' of ssh://git.php.net/php-src

  • Loading branch information...
2 parents b0e8fb6 + 1fafc9b commit 54cbf5315c11172eeba9231d0f0f7f3174dee210 Andrey Hristov committed Oct 16, 2012
View
6 NEWS
@@ -3,6 +3,8 @@ PHP NEWS
?? ??? 201?, PHP 5.5.0
- General improvements:
+ . Add simplified password hashing API
+ (https://wiki.php.net/rfc/password_hash). (Anthony Ferrara)
. Add generators and coroutines (https://wiki.php.net/rfc/generators).
(Nikita Popov)
. Support list in foreach (https://wiki.php.net/rfc/foreachlist). (Laruence)
@@ -84,4 +86,8 @@ PHP NEWS
- Zip:
. Upgraded libzip to 0.10.1 (Anatoliy)
+- Fileinfo:
+ . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
+ (Anatoliy)
+
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
View
@@ -4,22 +4,16 @@
ARG_ENABLE("fileinfo", "fileinfo support", "no");
if (PHP_FILEINFO != 'no') {
- if (CHECK_HEADER_ADD_INCLUDE("dirent.h", "CFLAGS_FILEINFO") &&
- CHECK_LIB("dirent_a.lib", "fileinfo", PHP_FILEINFO)) {
- LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
- cdf.c cdf_time.c compress.c \
- encoding.c fsmagic.c funcs.c \
- is_tar.c magic.c print.c \
- readcdf.c readelf.c softmagic.c";
+ LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
+ cdf.c cdf_time.c compress.c \
+ encoding.c fsmagic.c funcs.c \
+ is_tar.c magic.c print.c \
+ readcdf.c readelf.c softmagic.c";
- if (VCVERS < 1500) {
- ADD_FLAG('CFLAGS', '/Zm1000');
- }
+ if (VCVERS < 1500) {
+ ADD_FLAG('CFLAGS', '/Zm1000');
+ }
- EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
- ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, "fileinfo");
- } else {
- WARNING("fileinfo not enabled; libraries and headers not found");
- PHP_FILEINFO = "no";
- }
+ EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
+ ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, "fileinfo");
}
Oops, something went wrong.

0 comments on commit 54cbf53

Please sign in to comment.