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

* 'PHP-5.5' of https://git.php.net/repository/php-src:
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Update UPGRADING and make typo fixes to OCI8 package.xml
Fix --enable-maintainer-zts mode in OCI8 2.0
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fix --enable-maintainer-zts mode in OCI8 2.0
OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count
Fixed bug #65336
Update NEWS
Fixed bug #65336
Merge from GitHub
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

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

# By Dmitry Stogov
# Via Dmitry Stogov
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Merge from GitHub
make simplexml headers available to the outta world
Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
	NEWS
A minor fix for configure outpu (Tony)
Merge branch 'PHP-5.5'

* PHP-5.5:
  A minor fix for configure outpu (Tony)
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing & saving Makefile using Emacs.