Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 09:39:47 +0000 (11:39 +0200)
committerMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 09:39:47 +0000 (11:39 +0200)
1  2 
src/php_http_encoding.c

Simple merge