]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ee20e4 0cea9e6)
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Fri, 1 Feb 2013 18:26:11 +0000 (19:26 +0100)
committerRemi Collet <remi@php.net>
Fri, 1 Feb 2013 18:26:11 +0000 (19:26 +0100)
* PHP-5.4:
  Fixed bug #64128 buit-in web server is broken on ppc64.

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.