granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 98fcee4 54fee59)

author	Michael Wallner <mike@php.net>
	Wed, 30 Apr 2014 07:28:21 +0000 (09:28 +0200)
committer	Michael Wallner <mike@php.net>
	Wed, 30 Apr 2014 07:28:21 +0000 (09:28 +0200)
commit	407612083f0d71decbd3ca2e6a610d4824957364
tree	8515f66ce8f888e2a579d395d52aed42366f389e	tree \| snapshot
parent	98fcee48f9b9e3d2ca3472a4e907565e0eccb7a5	commit \| diff
parent	54fee59598082052395f4011931096babd6f4013	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

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

ext/curl/interface.c

Unnamed repository; edit this file 'description' to name the repository.