]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Fri, 13 Jun 2014 00:56:10 +0000 (17:56 -0700)
committerAdam Harvey <aharvey@php.net>
Fri, 13 Jun 2014 00:56:10 +0000 (17:56 -0700)
commite956ba935765c410195a3d402aa9456d187472d6
treebf4217751f0257df809d84589fac82f170760cd4
parentaa3a5f7681060b9fe7839479d4b4355ccaa10e5e
parentfe676748091e3329a8c8b053b7ce6fd41ae264e6
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add 308 and 426 to the HTTP response code map in the CLI server.
NEWS
sapi/cli/php_cli_server.c