Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 06:07:59 +0000 (08:07 +0200)
committerMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 06:08:49 +0000 (08:08 +0200)
commitc4f87eca8a03263a6506ae2ddc56f76b6b988c51
treee6e80f782e21ae8cf16df2b932333a27df549c70
parent0869caece2853a07711676bad8f032fa89ed82e9
parent061a30e33e42ae9332a56c26cbe15bccc9d0f61f
Merge branch 'v2.6.x'
scripts/gen_curlinfo.php
src/php_http_client_curl.c