]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4508a84 d0cd112)
Merge branch 'PHP-5.5' into PHP-5.6
authorChristopher Jones <sixd@php.net>
Fri, 15 Nov 2013 20:37:17 +0000 (12:37 -0800)
committerChristopher Jones <sixd@php.net>
Fri, 15 Nov 2013 20:37:17 +0000 (12:37 -0800)
* PHP-5.5:
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990

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

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