]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70713a2 c8687ee)
Merge branch 'PHP-5.4'
authorPierrick Charron <pierrick@php.net>
Sat, 22 Sep 2012 14:19:16 +0000 (10:19 -0400)
committerPierrick Charron <pierrick@php.net>
Sat, 22 Sep 2012 14:19:16 +0000 (10:19 -0400)
* PHP-5.4:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file

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

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