From: Michael Wallner <mike@php.net>
Date: Wed, 30 Apr 2014 07:29:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c559c7d8d45b7226d14aa0c8cce20179005af01;p=php

Merge branch 'PHP-5.6'

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

8c559c7d8d45b7226d14aa0c8cce20179005af01