Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 10:56:01 +0000 (12:56 +0200)
committerMichael Wallner <mike@php.net>
Wed, 14 Sep 2016 10:56:01 +0000 (12:56 +0200)
commitb41323e1817c50d062b27da798c7db35fa58212c
tree557b93d48992dace84185be62707fb5fe32e616f
parentd5c7f974d81c724c6fad8b54f1c37ce0795119de
parentf8b17453289061baee75586df671c62e9cd120e1
Merge branch 'v2.6.x'
src/php_http_encoding.c