From: Michael Wallner <mike@php.net>
Date: Wed, 30 Apr 2014 07:28:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta2~1^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=407612083f0d71decbd3ca2e6a610d4824957364;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
---

407612083f0d71decbd3ca2e6a610d4824957364