taf2-curb 0.3.0.0 → 0.3.5.0

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.3.0.0"
-#define CURB_VER_NUM   300
+#define CURB_VERSION   "0.3.5.0"
+#define CURB_VER_NUM   350
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   3
-#define CURB_VER_MIC   0
+#define CURB_VER_MIC   5
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_multi.c

@@ -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()) {

data/ext/extconf.rb

@@ -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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.0
+  version: 0.3.5.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: []