Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 15 Jun 2016 14:11:52 +0000 (16:11 +0200)
committerMichael Wallner <mike@php.net>
Wed, 15 Jun 2016 14:11:52 +0000 (16:11 +0200)
commit28d7c572181c8c3c335edd3df539f75c3bbde0fd
treee6a05380ab4be1b405ac435127f97f5e882022d2
parentfaa808ce8c1c11496a2d35845253d3ba8488fcad
parente761c34103c0c5316cce092ea42a789b95e887d2
Merge branch 'v2.6.x'
src/php_http_api.h