Merge branch 'PHP-5.5'

* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
better way to fix PRIu64 availability on windows
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  better way to fix PRIu64 availability on windows
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
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
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By David Soria Parra (6) and others
# Via David Soria Parra (5) and Michael Wallner (1)
* 'PHP-5.5' 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
Merge branch 'master' of https://git.php.net/repository/php-src

# By Michael Wallner (18) and others
# Via David Soria Parra (8) and others
* 'master' of https://git.php.net/repository/php-src: (37 commits)
  better way to fix PRIu64 availability on windows
  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
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix build - PRIu64 vs %I64u
  final bits
  we need to use the full stream wrapper for filters
  let the libsqlite3 symbols be exported in dll
  NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
  Exclude bison 3.0 by Mike
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  upload2G note
  NEWS for #60577
  NEWS for bug #64441
  ...
Build OCI8 2.0 on Windows with Oracle Database 12c libraries only
fix Zend/tests/ns_040.phpt failing

It was wrongly assumed the namespace has to be looked up in a case
sensitive manner too. Fixed the lookup to use a lower case
represenation of the import name.
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Build OCI8 2.0 on Windows with Oracle Database 12c libraries only
add note about request_body and php://input
Merge branch 'master' of https://git.php.net/repository/php-src

# By Michael Wallner
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
Merge branch 'PHP-5.5'

* PHP-5.5:
Added application/pdf to PHP CLI Web Server mime types.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Added application/pdf to PHP CLI Web Server mime types.
added openssl_x509_digest(), output is binary sha1
added option for raw output
added option for hash function
indentation fail