]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98fcee4 54fee59)
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 07:28:21 +0000 (09:28 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Apr 2014 07:28:21 +0000 (09:28 +0200)
* PHP-5.5:
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)

1  2 
ext/curl/interface.c patch | diff1 | diff2 | blob | history

diff --cc ext/curl/interface.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.