curb 0.6.5.1 → 0.6.6.0

data/Rakefile

@@ -100,7 +100,7 @@ Rake::TestTask.new(:bugtests) do |t|
   t.test_files = FileList['tests/bug_*.rb']
   t.verbose = false
 end
-                          
+ 
 #Rake::TestTask.new(:funtests) do |t|
   #  t.test_files = FileList['test/func_*.rb']
   #t.warning = true

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.6.5.1"
-#define CURB_VER_NUM   651
+#define CURB_VERSION   "0.6.6.0"
+#define CURB_VER_NUM   660
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   6
-#define CURB_VER_MIC   5
-#define CURB_VER_PATCH 1
+#define CURB_VER_MIC   6
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -134,46 +134,6 @@ static int proc_debug_handler(CURL *curl,
 
 /* ================== MARK/FREE FUNC ==================*/
 void curl_easy_mark(ruby_curl_easy *rbce) {
-#if 0
-  rb_gc_mark(rbce->url);
-  rb_gc_mark(rbce->proxy_url);
-  rb_gc_mark(rbce->body_proc);
-  rb_gc_mark(rbce->body_data);
-  rb_gc_mark(rbce->header_proc);
-  rb_gc_mark(rbce->header_data);
-  rb_gc_mark(rbce->progress_proc);
-  rb_gc_mark(rbce->debug_proc);
-  rb_gc_mark(rbce->interface_hm);
-  rb_gc_mark(rbce->userpwd);
-#if HAVE_CURLOPT_USERNAME
-  rb_gc_mark(rbce->username);
-#endif
-#if HAVE_CURLOPT_PASSWORD
-  rb_gc_mark(rbce->password);
-#endif
-  rb_gc_mark(rbce->proxypwd);
-  rb_gc_mark(rbce->headers);
-  rb_gc_mark(rbce->cookies);
-  rb_gc_mark(rbce->cookiefile);
-  rb_gc_mark(rbce->cookiejar);
-  rb_gc_mark(rbce->cert);
-  rb_gc_mark(rbce->cacert);
-  rb_gc_mark(rbce->certpassword);
-  rb_gc_mark(rbce->certtype);
-  rb_gc_mark(rbce->encoding);
-  rb_gc_mark(rbce->useragent);
-  rb_gc_mark(rbce->success_proc);
-  rb_gc_mark(rbce->failure_proc);
-  rb_gc_mark(rbce->complete_proc);
-
-  rb_gc_mark(rbce->postdata_buffer);
-  rb_gc_mark(rbce->bodybuf);
-  rb_gc_mark(rbce->headerbuf);
-
-  if( rbce->upload != Qnil ) {
-    rb_gc_mark(rbce->upload);
-  }
-#endif
   rb_gc_mark(rbce->opts);
 }
 
@@ -1568,10 +1528,11 @@ static VALUE cb_each_http_header(VALUE header, struct curl_slist **list) {
  *
  * Always returns Qtrue, rb_raise on error.
  */
-VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
+VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   // TODO this could do with a bit of refactoring...
   CURL *curl;
   VALUE url, _url = rb_easy_get("url");
+  struct curl_slist **hdrs = &(rbce->curl_headers);
 
   curl = rbce->curl;
 
@@ -1823,10 +1784,10 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
  *
  * Always returns Qtrue.
  */
-VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, struct curl_slist *headers ) {
+VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
 
   CURL *curl = rbce->curl;
-  
+  struct curl_slist *headers = rbce->curl_headers;
   // Free everything up
   if (headers) {
     curl_slist_free_all(headers);

data/ext/curb_easy.h

@@ -53,8 +53,8 @@ typedef struct {
 
 extern VALUE cCurlEasy;
 
-VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce, struct curl_slist **headers);
-VALUE ruby_curl_easy_cleanup(VALUE self, ruby_curl_easy *rbce, struct curl_slist *headers);
+VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce);
+VALUE ruby_curl_easy_cleanup(VALUE self, ruby_curl_easy *rbce);
 
 void init_curb_easy();
 

data/ext/curb_multi.c

@@ -28,6 +28,8 @@ static VALUE idCall;
 
 VALUE cCurlMulti;
 
+static long cCurlMutiDefaulttimeout = 100; /* milliseconds */
+
 static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy);
 static void rb_curl_multi_read_info(VALUE self, CURLM *mptr);
 
@@ -92,6 +94,30 @@ VALUE ruby_curl_multi_new(VALUE klass) {
   return new_curlm;
 }
 
+/*
+ * call-seq:
+ *   Curl::Multi.default_timeout = 4 => 4
+ *
+ * Set the global default time out for all Curl::Multi Handles.  This value is used
+ * when libcurl cannot determine a timeout value when calling curl_multi_timeout.
+ *
+ */
+VALUE ruby_curl_multi_set_default_timeout(VALUE klass, VALUE timeout) {
+  cCurlMutiDefaulttimeout = FIX2LONG(timeout);
+  return timeout;
+}
+
+/*
+ * call-seq:
+ *   Curl::Multi.default_timeout = 4 => 4
+ *
+ * Get the global default time out for all Curl::Multi Handles.
+ *
+ */
+VALUE ruby_curl_multi_get_default_timeout(VALUE klass) {
+  return INT2FIX(cCurlMutiDefaulttimeout);
+}
+
 /* Hash#foreach callback for ruby_curl_multi_requests */
 static int ruby_curl_multi_requests_callback(VALUE key, VALUE value, VALUE result_array) {
   rb_ary_push(result_array, value);
@@ -194,14 +220,14 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
   Data_Get_Struct(easy, ruby_curl_easy, rbce);
 
+  /* setup the easy handle */
+  ruby_curl_easy_setup( rbce );
+
   mcode = curl_multi_add_handle(rbcm->handle, rbce->curl);
   if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
     raise_curl_multi_error_exception(mcode);
   }
 
-  /* setup the easy handle */
-  ruby_curl_easy_setup( rbce, &(rbce->curl_headers) );
-
   rbcm->active++;
 
   /* Increase the running count, so that the perform loop keeps running.
@@ -253,7 +279,7 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
 
   rbcm->active--;
 
-  ruby_curl_easy_cleanup( easy, rbce, rbce->curl_headers );
+  ruby_curl_easy_cleanup( easy, rbce );
 
   // active should equal INT2FIX(RHASH(rbcm->requests)->tbl->num_entries)
   r = rb_hash_delete( rbcm->requests, easy );
@@ -417,11 +443,11 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
       continue;
     }
     else if(timeout_milliseconds < 0) {
-      timeout_milliseconds = 500; /* wait half a second, libcurl doesn't know how long to wait */
+      timeout_milliseconds = cCurlMutiDefaulttimeout; /* wait half a second, libcurl doesn't know how long to wait */
     }
 #ifdef __APPLE_CC__
     if(timeout_milliseconds > 1000) {
-      timeout_milliseconds = 1000; /* apple libcurl sometimes reports huge timeouts... let's cap it */
+      timeout_milliseconds = cCurlMutiDefaulttimeout; /* apple libcurl sometimes reports huge timeouts... let's cap it */
     }
 #endif
 
@@ -458,6 +484,8 @@ void init_curb_multi() {
 
   /* Class methods */
   rb_define_singleton_method(cCurlMulti, "new", ruby_curl_multi_new, 0);
+  rb_define_singleton_method(cCurlMulti, "default_timeout=", ruby_curl_multi_set_default_timeout, 1);
+  rb_define_singleton_method(cCurlMulti, "default_timeout", ruby_curl_multi_get_default_timeout, 0);
   
   /* "Attributes" */
   rb_define_method(cCurlMulti, "requests", ruby_curl_multi_requests, 0);

data/tests/bug_multi_segfault.rb

@@ -6,5 +6,9 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','ext'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 require 'curb'
-multi = Curl::Multi.new
-exit
+
+class BugMultiSegfault < Test::Unit::TestCase
+  def test_bug
+    multi = Curl::Multi.new
+  end
+end

data/tests/bugtests.rb

@@ -0,0 +1,9 @@
+$: << $TESTDIR = File.expand_path(File.dirname(__FILE__))
+puts "start"
+begin
+Dir[File.join($TESTDIR, 'bug_*.rb')].each { |lib| require lib }
+rescue Object => e
+  puts e.message
+ensure
+puts "done"
+end

data/tests/tc_curl_multi.rb

@@ -424,6 +424,13 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     assert_equal Curl::Err::MultiBadEasyHandle, e.class
   end
 
+  def test_multi_default_timeout
+    assert_equal 100, Curl::Multi.default_timeout
+    Curl::Multi.default_timeout = 12
+    assert_equal 12, Curl::Multi.default_timeout
+    assert_equal 100, (Curl::Multi.default_timeout = 100)
+  end
+
   include TestServerMethods
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.6.5.1
+  version: 0.6.6.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -05:00
+date: 2010-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,18 +32,18 @@ files:
 - lib/curb.rb
 - lib/curl.rb
 - ext/curb.c
-- ext/curb_postfield.c
-- ext/curb_multi.c
-- ext/curb_errors.c
 - ext/curb_easy.c
+- ext/curb_errors.c
+- ext/curb_multi.c
+- ext/curb_postfield.c
 - ext/curb_upload.c
+- ext/curb.h
 - ext/curb_easy.h
 - ext/curb_errors.h
-- ext/curb_upload.h
 - ext/curb_macros.h
-- ext/curb.h
-- ext/curb_postfield.h
 - ext/curb_multi.h
+- ext/curb_postfield.h
+- ext/curb_upload.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -75,19 +75,19 @@ signing_key:
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/unittests.rb
-- tests/mem_check.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/bug_instance_post_differs_from_class_post.rb
-- tests/tc_curl_download.rb
 - tests/alltests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
-- tests/helper.rb
-- tests/tc_curl_easy.rb
+- tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
-- tests/require_last_or_segfault_script.rb
 - tests/bug_postfields_crash.rb
-- tests/s.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/bugtests.rb
+- tests/helper.rb
+- tests/mem_check.rb
+- tests/require_last_or_segfault_script.rb
+- tests/tc_curl_download.rb
+- tests/tc_curl_easy.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/unittests.rb

data/tests/s.rb

@@ -1,4 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-c = Curl::Easy.new("http://www.google.com/")
-c.perform