Merge branch 'PHP-5.3' into PHP-5.4

author Hannes Magnusson <bjori@php.net>

Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)

committer Hannes Magnusson <bjori@php.net>

Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)
author Hannes Magnusson <bjori@php.net>
Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)
committer Hannes Magnusson <bjori@php.net>
Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)
diff --cc configure.in
Simple merge
diff --cc ext/soap/php_http.c
Simple merge
author	Hannes Magnusson <bjori@php.net>
	Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)
committer	Hannes Magnusson <bjori@php.net>
	Sat, 24 Mar 2012 16:20:14 +0000 (17:20 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
ext/soap/php_http.c	patch \|	diff1 \|	diff2 \|	blob \| history