Merge branch 'master' into phpng
authorMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 09:33:35 +0000 (10:33 +0100)
committerMichael Wallner <mike@php.net>
Wed, 18 Feb 2015 10:26:54 +0000 (11:26 +0100)
commit95c6c900d04096d332c422e3f597186b7184c5ab
tree96e84b0ecf64632d01624dcdce66cbdfafc57091
parent1bef05c9e90799c57722bdb4865e6829373fee20
parenteafbe5359bfb82233e5591147dc589cb957562c6
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
20 files changed:
config9.m4
package.xml
php_http.c
php_http_api.h
php_http_client.c
php_http_client.h
php_http_client_curl.c
php_http_env.c
php_http_env_response.c
php_http_header.c
php_http_header_parser.c
php_http_header_parser.h
php_http_message.c
php_http_message_body.c
php_http_message_parser.c
php_http_message_parser.h
php_http_misc.h
php_http_url.h
tests/messageparser002.phpt
tests/phpinfo.phpt