Merge branch 'v2.6.x' of ../ext-http

author Michael Wallner <mike@php.net>

Tue, 4 Oct 2016 08:28:41 +0000 (10:28 +0200)

committer Michael Wallner <mike@php.net>

Tue, 4 Oct 2016 08:28:41 +0000 (10:28 +0200)
author Michael Wallner <mike@php.net>
Tue, 4 Oct 2016 08:28:41 +0000 (10:28 +0200)
committer Michael Wallner <mike@php.net>
Tue, 4 Oct 2016 08:28:41 +0000 (10:28 +0200)
diff --cc README.md
Simple merge
diff --cc src/php_http_url.c
Simple merge
author	Michael Wallner <mike@php.net>
	Tue, 4 Oct 2016 08:28:41 +0000 (10:28 +0200)
committer	Michael Wallner <mike@php.net>
	Tue, 4 Oct 2016 08:28:41 +0000 (10:28 +0200)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/php_http_url.c	patch \|	diff1 \|	diff2 \|	blob \| history