Merge branch 'unify_http'

author Andrea Faulds <ajf@ajf.me>

Sun, 14 Dec 2014 19:18:23 +0000 (19:18 +0000)

committer Andrea Faulds <ajf@ajf.me>

Sun, 14 Dec 2014 19:18:23 +0000 (19:18 +0000)
author Andrea Faulds <ajf@ajf.me>
Sun, 14 Dec 2014 19:18:23 +0000 (19:18 +0000)
committer Andrea Faulds <ajf@ajf.me>
Sun, 14 Dec 2014 19:18:23 +0000 (19:18 +0000)
diff --cc sapi/cgi/cgi_main.c
Simple merge
diff --cc sapi/cli/php_cli_server.c
Simple merge
author	Andrea Faulds <ajf@ajf.me>
	Sun, 14 Dec 2014 19:18:23 +0000 (19:18 +0000)
committer	Andrea Faulds <ajf@ajf.me>
	Sun, 14 Dec 2014 19:18:23 +0000 (19:18 +0000)
		1	2
sapi/cgi/cgi_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/cli/php_cli_server.c	patch \|	diff1 \|	diff2 \|	blob \| history