projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95fcf86 949cab0)
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)
* PHP-5.4:
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup

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.