git.m6w6.name Git - m6w6/ext-http/commit

projects / m6w6 / ext-http / commit

summary | shortlog | log | commit | commitdiff | tree | github
(merge: f00dec5 3c93fd6)

author	Michael Wallner <mike@php.net>
	Fri, 7 Aug 2015 09:36:04 +0000 (11:36 +0200)
committer	Michael Wallner <mike@php.net>
	Fri, 7 Aug 2015 09:36:04 +0000 (11:36 +0200)
commit	1f37d09e4c7f55cf6f2c3c10ea3ec2424a482671
tree	4dd3bad44121b023eb9f2d24ed142d7a35a1a682	tree \| snapshot
parent	f00dec5b0217c81cf9d71d96103106fdaf2ab310	commit \| diff
parent	3c93fd628b6652171a01738d75791a73e4655359	commit \| diff

Merge branch 'master' into phpng

Conflicts:
php_http_client.c
php_http_client_curl.c
php_http_env_request.c
php_http_env_response.c
php_http_header_parser.c

config9.m4	diff1 \|	diff2 \|	blob \| history
php_http_client_curl.c	diff1 \|	diff2 \|	blob \| history
php_http_env_request.c	diff1 \|	diff2 \|	blob \| history
php_http_header_parser.c	diff1 \|	diff2 \|	blob \| history
php_http_querystring.c	diff1 \|	diff2 \|	blob \| history
php_http_url.c	diff1 \|	diff2 \|	blob \| history
tests/helper/server.inc	diff1 \|	diff2 \|	blob \| history

Extended HTTP Support