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:
  fix using wrong buffer pointer
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  bump version
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
Better test: Check combined leading/trailing
Merge branch 'PHP-5.4' into JSONWhitespaceFix
UPGRADING and NEWS
When src->src is null this doesn't get initialized
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
5.4.21 release date
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
fix memory leak on error (from Coverity scan)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix memory leak on error (from Coverity scan)
Fixed issue #115 (path issue when using phar).
Just SKIP that test on travis
Fixed compilation warning
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Just SKIP that test on travis
remove TRAVIS check in test source
Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5

* refs/remotes/origin/PHP-5.5:
  Fixed compilation warning