Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Mon, 1 Sep 2014 09:03:42 +0000 (11:03 +0200)
committerMichael Wallner <mike@php.net>
Mon, 1 Sep 2014 09:03:42 +0000 (11:03 +0200)
commitf155d6d142f3320ec0d327a993773d453e25ddc3
tree0ecdbd9b297788ef16fae4772b87a61167c30e86
parentbf151cf772afff6f2fd675f2c10d49aa59ae3dc4
parent82fb513a190c960a3c9f48c2cd1581c1e82781d3
Merge branch 'R_2_1'
php_http.c