Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
	NEWS
Merge branch 'PHP-5.4'

* PHP-5.4:
  - BFN
  Minor changes for MySQL 5.6
  NEWS for 76601c4
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  - BFN
  Minor changes for MySQL 5.6
  NEWS for 76601c4
Fix some double free issues, and more cleanup work
Fix issue with possible memory leak
Really fix leaks, add test cases to prove it...
fix allocation and copy issue
Clean up unreported memory leak by switching to zval_ptr_dtor
Refactor to using a stack based zval instead of dynamic allocation
Merging in Password Hashing API into master

This implements the accepted RFC password_hash https://wiki.php.net/rfc/password_hash
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #63248 Load multiple magic files on win

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

* 'master' of git.php.net:php-src: (46 commits)
  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
  Refactoring to use size_t instead of int most places
  ...
Updating expected output in anticipation of mysqlnd_auth.c path
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
  ...
Cover have_ssl=NO and have_ssl=DISABLED
Fixed bug #63248 Load multiple magic files on win

- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #63248 Load multiple magic files on win
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Cover have_ssl=NO and have_ssl=DISABLED
Merge branch 'PHP-5.4'

* PHP-5.4:
  Cover have_ssl=NO and have_ssl=DISABLED