]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 08:39:10 +0000 (10:39 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 08:39:10 +0000 (10:39 +0200)
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup

1  2 
sapi/cli/php_cli_server.c

Simple merge