5.5.18 now
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).

SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now

Conflicts:
	configure.in
	main/php_version.h
Fine tuned the order of adding request variables.
Fine tuned the order of adding request variables.
Fine tuned the order of adding request variables.
duplicate value's string for the SAPI filter

reported by sesser; tyrael, do you take care of the bug/NEWS?
Fixed #67985 - Incorrect last used array index copied to new array after unset

In master zend_array_dup() is used to do this properly; this is a workaround.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed #67985 - Incorrect last used array index copied to new array after unset
Updated NEWS for #67985
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed #67985 - Incorrect last used array index copied to new array after unset
Updated NEWS for #67985
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Bug #41631: Fix regression from first attempt (6569db8)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
update NEWS