]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 07:29:53 +0000 (09:29 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 07:29:53 +0000 (09:29 +0200)
commit8c559c7d8d45b7226d14aa0c8cce20179005af01
tree66fd7c3bd6ba01f4ae926ac9fe8acde08ea3f604
parent50396e6c10b193391fcd280b3030810fa57a2568
parentaaad7ead55c33688156ad1cd85412041eadf0628
Merge branch 'PHP-5.6'

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