diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rw-r--r-- | m4/curl-functions.m4 | 9 |
3 files changed, 14 insertions, 4 deletions
@@ -7,6 +7,12 @@ Changelog Daniel Stenberg (2 Mar 2010) +- Markus Duft pointed out in bug #2961796 that even though Interix has a + poll() function it doesn't quite work the way we want it so we must disable + it, and he also provided a patch for it. + + http://curl.haxx.se/bug/view.cgi?id=2961796 + - Made the pingpong timeout code properly deal with the response timeout AND the global timeout if set. Also, as was reported in the bug report #2956437 by Ryan Chan, the time stamp to use as basis for the per command timeout was diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f47f6944f..b35641e0d 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -24,6 +24,7 @@ This release includes the following bugfixes: o superfluous blocking for OpenSSL-based SSL connects and multi interface o TFTP upload o FTP timeouts after file transferred completely + o skip poll() on Interix This release includes the following known bugs: @@ -34,6 +35,6 @@ advice from friends like these: Steven M. Schweda, Yang Tse, Jack Zhang, Tom Donovan, Martin Hager, Daniel Fandrich, Patrick Monnerat, Pat Ray, Wesley Miaw, Ben Greear, - Ryan Chan + Ryan Chan, Markus Duft Thanks! (and sorry if I forgot to mention someone) diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 70e57d073..9e0e65e41 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -3815,8 +3815,11 @@ AC_DEFUN([CURL_CHECK_FUNC_POLL], [ tst_allow_poll="unknown" # case $host_os in - darwin*) - dnl poll does not work on this platform + darwin*|interix*) + dnl poll() does not work on these platforms + dnl Interix: "does provide poll(), but the implementing developer must + dnl have been in a bad mood, because poll() only works on the /proc + dnl filesystem here" curl_disallow_poll="yes" ;; esac |