]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit419bef3070b6c637c81a7200211d16d7c98255ae
tree4cfd069d75cc7cb9a661a0552d14249a7b89ff2btree | snapshot
parent4508a84d0dd0af3041c86ed945cc192d575d6396commit | diff
parentd0cd1127024410bd7b055500d1bd879c4187b832commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* 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
sapi/cli/php_cli_server.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.