Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Sun, 8 Feb 2015 15:23:13 +0000 (16:23 +0100)
committerMichael Wallner <mike@php.net>
Sun, 8 Feb 2015 20:44:03 +0000 (21:44 +0100)
commitbe9585b914061f84c5d5939673d29ecc048ab1d7
treee7679ae2b364ce0b2665fd91833008c32985919e
parente22fc5f78e8cfc1101c4548de0568add46a8694a
parent90b581e9c564acde783926e412d7c5d737c4cbe4
Merge branch 'master' into phpng

Conflicts:
php_http_client.c
php_http_client.h
php_http_client_curl.c
php_http_env_response.c
php_http_info.c
php_http_message.c
php_http_object.c
php_http_object.h
php_http_url.c
php_http_url.h
19 files changed:
config9.m4
gen_curlinfo.php
php_http_buffer.c
php_http_client.c
php_http_client.h
php_http_client_curl.c
php_http_cookie.c
php_http_encoding.c
php_http_env_response.c
php_http_info.c
php_http_info.h
php_http_message.c
php_http_message_body.c
php_http_message_parser.c
php_http_object.c
php_http_object.h
php_http_url.c
php_http_url.h
php_http_version.c