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

* 'PHP-5.3' of git.php.net:php-src: (59 commits)
  Fixed defective cloning in ext/intl classes
  Fixed bug (segfault while build with zts and GOTO vm-kind)
  better fix
  Fix test
  Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2
  Fix handling of several uinitialized intl objects
  Fixed bug #62885 (mysqli_poll - Segmentation fault)
  - Removed PHP 6 checks
  skip test properly
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
  Move test files to tests dir
  skip test for bug 43130 on firebird , not relevant
  - Value stored to var is never used
  - Value stored to var is never used
  - Value stored to var is never used
  - Value stored to var is never used
  - Value stored to var is never used
  ...
Add SHA256 authentication support - password hashing to mysqlnd
Automatic switchover to SSL with plain-text password is not part of this
remove old unicode code, that is was compiled out by using a macro
change public key setting to PERDIR and finish code that allows
to set the key file programatically per mysqli_options()
compile out example plugin in a release build
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src: (29 commits)
  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
  Fixed bug #61442 (exception threw in __autoload can not be catched)
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)
  test should fail
  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)"
  Change package.xml fix description
  Fixed bug #60901 (Improve "tail" syntax for AIX installation)
  This will become 5.3.18
  Update RELEASE PROCESS
  fix NEWS after releses
  Fix doc bug #63032 (Number of release in documentation).
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
  ...
Fix bug #63173: Crash when invoking invalid array callback

The code did not check whether the zend_hash_index_find calls succeded,
so PHP crashed when an array callback was called that contains two elements
which don't have the indices 0 and 1.
Merge branch 'PHP-5.4'

Conflicts:
	Zend/zend_vm_def.h
fix unix/win dir separators
Merge branch 'PHP-5.4'

* PHP-5.4:
  fix unix/win dir separators
- Fixed bug #62954 (startup problems fpm / php-fpm)
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src: (367 commits)
  fix unix/win dir separators
  Fix bug #63173: Crash when invoking invalid array callback
  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)
  Bug #63000: MCAST_JOIN_GROUP on OSX is broken
  Fixed bug #61442 (exception threw in __autoload can not be catched)
  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)
  update news
  Support building PHP with the native client toolchain.
  ...
- Fixed bug #62954 (startup problems fpm / php-fpm)
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (641 commits)
  fix unix/win dir separators
  Fix bug #63173: Crash when invoking invalid array callback
  compile out example plugin in a release build
  change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options()
  remove old unicode code, that is was compiled out by using a macro
  Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this
  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)
  Add NEWS/UPGRADING for previous change
  Simplify set_error_handler/set_exception_handler code
  Return previous error handler when resetting the error handler
  Allow resetting the error handler
  Revert error/exception handler changes
  Fixed bug #63132
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Add CURLOPT_READDATA which was removed by mistake
  Fixing NEWS file
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
  ...
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
- Fixed bug #63085 (Systemd integration and daemonize)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - 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)

Conflicts:
	sapi/fpm/config.m4
- add missing php-fpm.service.in
- Fixed bug #63085 (Systemd integration and daemonize)
Merge branch 'PHP-5.4'

* PHP-5.4:
  - 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)