Merge branch 'v2.5.x'
authorMichael Wallner <mike@php.net>
Wed, 9 Mar 2016 09:56:20 +0000 (10:56 +0100)
committerMichael Wallner <mike@php.net>
Wed, 9 Mar 2016 09:56:20 +0000 (10:56 +0100)
commite57370d1f00da9e12de0917a9f907281ab8e84b5
tree4a805186cd92d0a604447aaf11657bcd147f3863
parenta38d5303f4d542ff6ccf152bf3b01641edbdf200
parent4f48201b690b6b10bffa348833364d1a3760483c
Merge branch 'v2.5.x'
src/php_http_client_curl.c
src/php_http_url.c