]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 08:32:26 +0000 (10:32 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 08:32:26 +0000 (10:32 +0200)
commitd440bb3e6854070f3b0a02b0d73b9b06065959af
tree3973fa8db894bb40a8221f6ca83074f3a0b1419d
parent95fcf868d3b71be3e370ee9f27aa4c120109e7ca
parent949cab09f24abb80b8585af744bd964dc17f7401
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
sapi/cli/php_cli_server.c