Typo fix (greater then => greater than)
Merge remote-tracking branch 'upstream/master'
typo fixes (accommodate, parameter)
typo fixes (argument)
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Anatol Belski (8) and others
# Via Anatol Belski (2) and others
* 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Fixed bug #65304 (Use of max int in array_sum)
  Reorder NEWS
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  Improve php.ini-* documentation
  5.4.19 is next
  Fixed bug #50308 - session id not appended properly for empty anchor tags
  Fix bug #62129 - rfc1867 crashes php even though turned off
  add news for xml fix
  fix TS build
  added sapi check for dl() test
  Make zval2myslqnd implementations aware of inheritance
  Fixed typo ensuring header str is \0 terminated
  fix buffer overrun
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  ...
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  ...
Merge branch 'master' of https://git.php.net/repository/php-src

# By Veres Lajos (15) and others
# Via Stanislav Malyshev (31) and others
* 'master' of https://git.php.net/repository/php-src: (99 commits)
  fixed possible null deref
  Disable a flag
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  updated test script for bug #65045.
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  ...
Merge branch 'bug65028' into PHP-5.4

* bug65028:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
Initial PHP OCI8 2.0.0-dev commit.

Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.

See package.xml for details.
Merge branch 'oci8_20'

* oci8_20:
  Initial PHP OCI8 2.0.0-dev commit.
Fixed bug #65328 (Segfault when getting SplStack object Value)
Merge branch 'PHP-5.4' into PHP-5.5
Update NEWs