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)
1  2 
src/php_http_api.h

Simple merge