Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Fixed bug #63093 (Segfault while load extension failed in zts-build).
  Add XFAIL test for bug #62852
  Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Respond with 501 to unknown request methods
  news for bug #61421
  commit for php bug 61421 enabling SHA2 and RMD160 for openssl signature verification
  Fixed bug #63093 (Segfault while load extension failed in zts-build).
  Remove bug fixed entry
  Add XFAIL test for bug #62852
  Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)"
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  test should fail
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  update news
  Support building PHP with the native client toolchain.
  test should fail
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Merging PR #116
  Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Fixed bug #61442 (exception threw in __autoload can not be catched)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Bug #63000: MCAST_JOIN_GROUP on OSX is broken
  Fixed bug #61442 (exception threw in __autoload can not be catched)
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
  Fix folding
  fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
NEWS for 76601c4
Minor changes for MySQL 5.6
- Fixed bug #63214 (Large PDO Firebird Queries)
- BFN
Merge branch 'PHP-5.3' into PHP-5.4

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

Conflicts:
	NEWS
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.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  exposing the libxpm version in phpinfo
  PHP-5.3 branch is 5.3.19 now
  reverted the previous fix for libpng include
  fixed include checks for libpng under win
  Avoding superfluous function call
  Add test for #35895
  Update NEWS
  FD_ZERO file descriptors before calling curl_multi_fdset
  Fixed bug #62216
  - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - add missing php-fpm.service.in
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
  - Updated to version 2012.6 (2012f)
  - Updated to version 2012.5 (2012e)
  - Updated to version 2012.4 (2012d)