]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorPierrick Charron <pierrick@php.net>
Fri, 28 Sep 2012 19:21:33 +0000 (15:21 -0400)
committerPierrick Charron <pierrick@php.net>
Fri, 28 Sep 2012 19:21:33 +0000 (15:21 -0400)
* PHP-5.3:
  FD_ZERO file descriptors before calling curl_multi_fdset

1  2 
ext/curl/streams.c

Simple merge