Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)

diff --cc sapi/cgi/cgi_main.c
Simple merge

diff --cc sapi/cli/php_cli_server.c
Simple merge