]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5516963 604de67)
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Mon, 7 Jul 2014 20:40:47 +0000 (20:40 +0000)
committerAdam Harvey <aharvey@php.net>
Mon, 7 Jul 2014 20:40:47 +0000 (20:40 +0000)
* PHP-5.4:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).

1  2 
NEWS patch | diff1 | diff2 | blob | history
sapi/cli/php_cli_server.c patch | diff1 | diff2 | blob | history

diff --cc NEWS
Simple merge
diff --cc sapi/cli/php_cli_server.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.