From: Michael Wallner <mike@php.net>
Date: Wed, 18 Feb 2015 09:33:35 +0000 (+0100)
Subject: Merge branch 'master' into phpng
X-Git-Tag: RELEASE_3_0_0_RC1~56
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=95c6c900d04096d332c422e3f597186b7184c5ab;hp=95c6c900d04096d332c422e3f597186b7184c5ab

Merge branch 'master' into phpng

Conflicts:
	package.xml
	php_http_client_curl.c
	php_http_env.c
	php_http_env_response.c
	php_http_header_parser.c
	php_http_message.c
	php_http_message_body.c
	php_http_message_parser.c
	php_http_misc.c
	php_http_strlist.c
	php_http_url.h
	tests/info.phpt
---