fix typo
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo
split fpm config to two parts. PR#903

main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
Fix bug #67106 split main fpm config
Share HTTP status codes map
Merge branch 'unify_http'

* unify_http:
  Share HTTP status codes map
Fix indentation
Change is_long() to be an alias of is_integer()

@@ See internals: news.php.net/php.internals/79639
@@ Manual will be updated so that is_int() will be an alias of is_integer()
@@ I picked integer over int for consitentcy as we do not use str instead of string either
NEWS
Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github
NEWS
Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes)
NEWS
Fixed bug #55415 (php_info produces invalid anchor names)

@@ Slightly based off Johannes' patch
fixed tests, bugs in status codes merger
Revert HTTP status codes merger

This reverts commits 65768edcf3ef27a21a07e5e994bfd9ca1cabfa94, 627b350f31be83eb1d5ac5fad692256dcfaf1281 and 9c18ad3ac9103bc0a6c7b7ab8938fd7272095652.
Save 8 bytes on 64 bits
Reorder to save alignment size (of course, only for common used structs)
small fixes to UPGRADING
Fixed test