granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3ee20e4 0cea9e6)

author	Remi Collet <remi@php.net>
	Fri, 1 Feb 2013 18:26:11 +0000 (19:26 +0100)
committer	Remi Collet <remi@php.net>
	Fri, 1 Feb 2013 18:26:11 +0000 (19:26 +0100)
commit	5d3501c7d436884cd41c8f8f50b849200cfd7dd5
tree	e53ca0800d51d9110451b4381cbbb5555cc48c68	tree \| snapshot
parent	3ee20e450fb5e52f68174f982fbd4f13eb2d9beb	commit \| diff
parent	0cea9e6843384c6c0ebb52047c42b0431a4f5660	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #64128 buit-in web server is broken on ppc64.

sapi/cli/php_cli_server.c

Unnamed repository; edit this file 'description' to name the repository.