@@ -298,20 +298,23 @@ static VALUE ruby_curl_multi_perform(VALUE self) { raise_curl_multi_error_exception(mcode); } +#ifdef HAVE_CURL_MULTI_TIMEOUT /* get the curl suggested time out */ mcode = curl_multi_timeout(rbcm->handle, &timeout); if (mcode != CURLM_OK) { raise_curl_multi_error_exception(mcode); } +#else + /* libcurl doesn't have a timeout method defined... make a wild guess */ + timeout = 1; /* wait a second */ +#endif if (timeout == 0) { /* no delay */ rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) ); continue; } else if (timeout == -1) { - timeout = 1; /* You must not wait too long - (more than a few seconds perhaps) before - you call curl_multi_perform() again */ + timeout = 1; /* wait a second */ } if (rb_block_given_p()) { ext/curb_multi.c @@ -81,6 +81,9 @@ have_constant "curlmopt_maxconnects" # centos 4.5 build of libcurl have_constant "curlm_bad_socket" have_constant "curlm_unknown_option" +have_func("curl_multi_timeout") +have_func("curl_multi_fdset") +have_func("curl_multi_perform") if try_compile('int main() { return 0; }','-Wall') $CFLAGS << ' -Wall' ext/extconf.rb f3c88353403022bd5d5a2755f0a0464b66a946f3 Todd A. Fisher taf2@web3.anerian.com http://github.com/taf2/curb/commit/9833f005cf309afaa33316372b34519d6988c8c2 9833f005cf309afaa33316372b34519d6988c8c2 2009-06-09T12:10:05-07:00 2009-06-09T12:10:05-07:00 more checks for cent os 4.5 versions of libcurl prior to 7.15 6f7b98d86e4cbdf17b5b6389dda5c2dd95ea839a Todd A. Fisher taf2@web3.anerian.com