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

* 'master' of git.php.net:php-src: (47 commits)
  Updating expected output in anticipation of mysqlnd_auth.c path
  updated NEWS
  Fixed bug #63248 Load multiple magic files on win
  Refactor to using a stack based zval instead of dynamic allocation
  Clean up unreported memory leak by switching to zval_ptr_dtor
  fix allocation and copy issue
  Really fix leaks, add test cases to prove it...
  Fix issue with possible memory leak
  Fix some double free issues, and more cleanup work
  Refactor  slightly to enable cleaner readability
  Fix arg info for required params passed to needs_rehash
  Fix ucwords error casing
  A bunch of naming convention fixes. No functionality changes
  Switch to using an ENUM for algorithms instead of a constant
  Fix incorrect arg info required param count for password_hash
  Add news entry for password API
  Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
  Remove bcrypt_cost ini entry from declaration
  Switch test to using strict comparison for crypt fallback
  Add tests for password_get_info and password_needs_rehash
  ...

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! >>>

ext/fileinfo/config.w32

@@ -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");
 }