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
5.4.21 now
Handle CLI server request headers case insensitively.

Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
Tinker with the wording of the short_open_tag description.

I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644. Plus, it now mentions the decoupling of <?=.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Tinker with the wording of the short_open_tag description.
  Handle CLI server request headers case insensitively.
Bug 64157
Changed error message to make sense
News for bugfix #64157
EmptyIterator now implements Countable; fixes bug 60577

(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)

(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
NEWS for bug #64441
NEWS for #60577
Add RFC 6598 IPs to reserved addresses

(cherry picked from commit b3f5b822e9f83d99d7cb5eed36ba8d307d1408ee)
NEWS for added reserved ip addresses according to RFC 6598
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
fix a very rare case of use of uninitialized value combined with a
memleak
RFC 6598 reserved ip range starts at 100.64.0.0
Revert "EmptyIterator now implements Countable; fixes bug 60577"

This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
Fix the broken sh syntax in ext/imap/config.m4.

Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).