]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 13 Jun 2014 00:57:55 +0000 (17:57 -0700)
committerAdam Harvey <aharvey@php.net>
Fri, 13 Jun 2014 00:57:55 +0000 (17:57 -0700)
* PHP-5.6:
  Add 308 and 426 to the HTTP response code map in the CLI server.

1  2 
sapi/cli/php_cli_server.c

Simple merge