Merge branch 'R_2_5'
authorMichael Wallner <mike@php.net>
Mon, 28 Sep 2015 14:12:37 +0000 (16:12 +0200)
committerMichael Wallner <mike@php.net>
Mon, 28 Sep 2015 14:12:37 +0000 (16:12 +0200)
commit57e944b102006abfa4005337b0ac5901425f4289
tree0ec437424a0a50866f4e1c1ca3f632a5c72f94ed
parent95433e1b55cd256df3fe3b6240ded359e8ba09a6
parentbdd6edb59194cda9e5fcb393c48ab4230fceb32a
Merge branch 'R_2_5'

Conflicts:
.gitignore
config.w32
56 files changed:
.gitignore
config9.m4
scripts/gen_curlinfo.php
scripts/gen_travis_yml.php
src/php_http.c
src/php_http_api.h
src/php_http_buffer.c
src/php_http_buffer.h
src/php_http_client.c
src/php_http_client.h
src/php_http_client_curl.c
src/php_http_client_curl.h
src/php_http_client_request.c
src/php_http_client_response.c
src/php_http_cookie.c
src/php_http_cookie.h
src/php_http_encoding.c
src/php_http_encoding.h
src/php_http_env.c
src/php_http_env.h
src/php_http_env_request.c
src/php_http_env_response.c
src/php_http_env_response.h
src/php_http_etag.c
src/php_http_etag.h
src/php_http_exception.c
src/php_http_exception.h
src/php_http_filter.c
src/php_http_header.c
src/php_http_header.h
src/php_http_header_parser.c
src/php_http_header_parser.h
src/php_http_info.c
src/php_http_info.h
src/php_http_message.c
src/php_http_message.h
src/php_http_message_body.c
src/php_http_message_body.h
src/php_http_message_parser.c
src/php_http_message_parser.h
src/php_http_misc.c
src/php_http_misc.h
src/php_http_negotiate.c
src/php_http_negotiate.h
src/php_http_object.c
src/php_http_object.h
src/php_http_options.c
src/php_http_options.h
src/php_http_params.c
src/php_http_params.h
src/php_http_querystring.c
src/php_http_querystring.h
src/php_http_url.c
src/php_http_url.h
src/php_http_version.c
src/php_http_version.h