curb 0.5.4.0 → 0.5.7.0

data/README

@@ -1,129 +1,157 @@
-== Curb - Libcurl bindings for Ruby
+# Curb - Libcurl bindings for Ruby
 
-* http://curb.rubyforge.org/
-* http://rubyforge.org/projects/curb
-* http://github.com/taf2/curb/tree/master
++ [rubyforge rdoc](http://curb.rubyforge.org/)
++ [rubyforge project](http://rubyforge.org/projects/curb)
++ [github project](http://github.com/taf2/curb/tree/master)
 
 Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
 libcurl(3), a fully-featured client-side URL transfer library.
-cURL and libcurl live at http://curl.haxx.se/ .
+cURL and libcurl live at [http://curl.haxx.se/](http://curl.haxx.se/) .
 
 Curb is a work-in-progress, and currently only supports libcurl's 'easy' and 'multi' modes.
 
-=== License
+## License
 
-Curb is copyright (c) 2006 Ross Bamford, and released under the terms of the 
+Curb is copyright (c)2006 Ross Bamford, and released under the terms of the 
 Ruby license. See the LICENSE file for the gory details. 
 
-=== You will need
+## You will need
 
-* A working Ruby installation (1.8+, tested with 1.8.5, 1.8.6, 1.8.7, and 1.9.1)
-* A working (lib)curl installation, with development stuff (7.5+, tested with 7.15)
-* A sane build environment
++ A working Ruby installation (1.8+, tested with 1.8.6, 1.8.7, 1.9.1, and 1.9.2)
++ A working (lib)curl installation, with development stuff (7.5+, tested with 7.19.x)
++ A sane build environment (e.g. gcc, make)
 
-=== Installation...
+## Installation...
 
 ... will usually be as simple as:
 
-	$ gem install curb
+    $ gem install curb
 	
 Or, if you downloaded the archive:	
 
-  $ rake install 
+    $ rake install 
 
 If you have a wierd setup, you might need extconf options. In this case, pass
 them like so:
 
-	$ rake install EXTCONF_OPTS='--with-curl-dir=/path/to/libcurl --prefix=/what/ever'
+    $ rake install EXTCONF_OPTS='--with-curl-dir=/path/to/libcurl --prefix=/what/ever'
 	
-Currently, Curb is tested only on GNU/Linux x86 - YMMV on other platforms.
+Curb is tested only on GNU/Linux x86 and Mac OSX - YMMV on other platforms.
 If you do use another platform and experience problems, or if you can 
-expand on the above instructions, please get in touch via the mailing
-list on Curb's Rubyforge page.
+expand on the above instructions, please report the issue at http://github.com/taf2/curb/issues
 
 Curb has fairly extensive RDoc comments in the source. You can build the
 documentation with:
 
-  $ rake doc
+    $ rake doc
 
-=== Examples
+## Examples
 
-Simple fetch via HTTP:
+### Simple fetch via HTTP:
 
-  c = Curl::Easy.perform("http://www.google.co.uk")
-  puts c.body_str
+    c = Curl::Easy.perform("http://www.google.co.uk")
+    puts c.body_str
 
-Same thing, more manual:
+### Same thing, more manual:
 
-  c = Curl::Easy.new("http://www.google.co.uk")
-  c.perform
-  puts c.body_str
+    c = Curl::Easy.new("http://www.google.co.uk")
+    c.perform
+    puts c.body_str
 
-Additional config:
+### Additional config:
 
-  Curl::Easy.perform("http://www.google.co.uk") do |curl| 
-    curl.headers["User-Agent"] = "myapp-0.0"
-    curl.verbose = true
-  end
+    Curl::Easy.perform("http://www.google.co.uk") do |curl| 
+      curl.headers["User-Agent"] = "myapp-0.0"
+      curl.verbose = true
+    end
 
-Same thing, more manual:
+### Same thing, more manual:
 
-  c = Curl::Easy.new("http://www.google.co.uk") do |curl| 
-    curl.headers["User-Agent"] = "myapp-0.0"
-    curl.verbose = true
-  end
+    c = Curl::Easy.new("http://www.google.co.uk") do |curl| 
+      curl.headers["User-Agent"] = "myapp-0.0"
+      curl.verbose = true
+    end
   
-  c.perform
+    c.perform
 
-Supplying custom handlers:
+### Supplying custom handlers:
 
-  c = Curl::Easy.new("http://www.google.co.uk")
+    c = Curl::Easy.new("http://www.google.co.uk")
   
-  c.on_body { |data| print(data) }
-  c.on_header { |data| print(data) }
+    c.on_body { |data| print(data) }
+    c.on_header { |data| print(data) }
   
-  c.perform
+    c.perform
 
-Reusing Curls:
+### Reusing Curls:
 
-  c = Curl::Easy.new
+    c = Curl::Easy.new
 
-  ["http://www.google.co.uk", "http://www.ruby-lang.org/"].map do |url|
-    c.url = url
-    c.perform
-    c.body_str
-  end
-
-HTTP POST form:
-
-  c = Curl::Easy.http_post("http://my.rails.box/thing/create",
-                           Curl::PostField.content('thing[name]', 'box',
-                           Curl::PostField.content('thing[type]', 'storage')
-
-HTTP POST file upload:
-
-  c = Curl::Easy.new("http://my.rails.box/files/upload")
-  c.multipart_form_post = true
-  c.http_post(Curl::PostField.file('myfile.rb'))
-
-Multi Interface:
-  responses = {}
-  requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
-  m = Curl::Multi.new
-  # add a few easy handles
-  requests.each do |url|
-    responses[url] = ""
-    c = Curl::Easy.new(url) do|curl|
-      curl.follow_location = true
-      curl.on_body{|data| responses[url] << data; data.size }
+    ["http://www.google.co.uk", "http://www.ruby-lang.org/"].map do |url|
+      c.url = url
+      c.perform
+      c.body_str
     end
-    m.add(c)
-  end
 
-  m.perform do
-    puts "idling... can do some work here, including add new requests"
-  end
+### HTTP POST form:
+
+    c = Curl::Easy.http_post("http://my.rails.box/thing/create",
+                             Curl::PostField.content('thing[name]', 'box'),
+                             Curl::PostField.content('thing[type]', 'storage'))
+
+### HTTP POST file upload:
+
+    c = Curl::Easy.new("http://my.rails.box/files/upload")
+    c.multipart_form_post = true
+    c.http_post(Curl::PostField.file('myfile.rb'))
+
+### Multi Interface (Basic HTTP GET):
+
+    # make multiple GET requests
+    easy_options = {:follow_location => true}
+    multi_options = {:pipeline => true}
 
-  requests.each do|url|
-    puts responses[url]
-  end
+    Curl::Multi.get('url1','url2','url3','url4','url5', easy_options, multi_options) do|easy|
+      # do something interesting with the easy response
+      puts easy.last_effective_url
+    end
+
+### Multi Interface (Basic HTTP POST):
+
+    # make multiple POST requests
+    easy_options = {:follow_location => true, :multipart_form_post => true}
+    multi_options = {:pipeline => true}
+
+    url_fields = [
+      { :url => 'url1', :post_fields => {'f1' => 'v1'} },
+      { :url => 'url2', :post_fields => {'f1' => 'v1'} },
+      { :url => 'url3', :post_fields => {'f1' => 'v1'} }
+    ]
+
+    Curl::Multi.post(url_fields, easy_options, multi_options) do|easy|
+      # do something interesting with the easy response
+      puts easy.last_effective_url
+    end
+
+### Multi Interface (Advanced):
+
+    responses = {}
+    requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
+    m = Curl::Multi.new
+    # add a few easy handles
+    requests.each do |url|
+      responses[url] = ""
+      c = Curl::Easy.new(url) do|curl|
+        curl.follow_location = true
+        curl.on_body{|data| responses[url] << data; data.size }
+      end
+      m.add(c)
+    end
+   
+    m.perform do
+      puts "idling... can do some work here, including add new requests"
+    end
+   
+    requests.each do|url|
+      puts responses[url]
+    end

data/Rakefile

@@ -36,7 +36,8 @@ task :test_ver do
 end
 
 # Make tasks -----------------------------------------------------
-MAKECMD = ENV['MAKE_CMD'] || 'make'
+make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+MAKECMD = ENV['MAKE_CMD'] || make_program
 MAKEOPTS = ENV['MAKE_OPTS'] || ''
 
 CURB_SO = "ext/curb_core.#{Config::MAKEFILE_CONFIG['DLEXT']}"
@@ -80,7 +81,7 @@ task :tu => :unittests
 task :test => [:rmpid,:unittests]
 
 task :rmpid do
-  sh "rm -rf tests/server_lock-*"
+  FileUtils.rm_rf Dir.glob("tests/server_lock-*")
 end
 
 if ENV['RELTEST']
@@ -155,6 +156,39 @@ else
     spec.validate
     Gem::Builder.new(spec).build
   end
+
+  task :static do
+    ENV['STATIC_BUILD'] = '1'
+  end
+
+  task :binary_gemspec => [:static, :compile] do
+    require 'erb'
+    ENV['BINARY_PACKAGE'] = '1'
+    tspec = ERB.new(File.read(File.join(File.dirname(__FILE__),'lib','curb.gemspec.erb')))
+
+    File.open(File.join(File.dirname(__FILE__),'curb-binary.gemspec'),'wb') do|f|
+      f << tspec.result
+    end
+  end
+
+  desc 'Strip extra strings from Binary'
+  task :binary_strip do
+    strip = '/usr/bin/strip'
+    if File.exist?(strip) and `#{strip} -h 2>&1`.match(/GNU/)
+      sh "#{strip} #{CURB_SO}"
+    end
+  end
+
+  desc 'Build gem'
+  task :binary_package => [:binary_gemspec, :binary_strip] do
+    require 'rubygems/specification'
+    spec_source = File.read File.join(File.dirname(__FILE__),'curb-binary.gemspec')
+    spec = nil
+    # see: http://gist.github.com/16215
+    Thread.new { spec = eval("$SAFE = 3\n#{spec_source}") }.join
+    spec.validate
+    Gem::Builder.new(spec).build
+  end
 end
 
 # --------------------------------------------------------------------

data/ext/curb.c

@@ -220,10 +220,12 @@ static VALUE ruby_curl_conv_q(VALUE mod) {
 
 void Init_curb_core() {
   // TODO we need to call curl_global_cleanup at exit!
-  curl_global_init(CURL_GLOBAL_ALL);
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
+  curl_version_info_data *ver;
   VALUE curlver, curllongver, curlvernum;
 
+  curl_global_init(CURL_GLOBAL_ALL);
+  ver = curl_version_info(CURLVERSION_NOW);
+
   mCurl = rb_define_module("Curl");
 
   curlver = rb_str_new2(ver->version);

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.5.4.0"
-#define CURB_VER_NUM   540
+#define CURB_VERSION   "0.5.7.0"
+#define CURB_VER_NUM   570
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   5
-#define CURB_VER_MIC   4
+#define CURB_VER_MIC   7
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -58,11 +58,15 @@ static size_t read_data_handler(void *ptr,
   }
   else {
     ruby_curl_upload *rbcu;
+    VALUE str;
+    size_t len;
+    size_t remaining;
+    char *str_ptr;
     Data_Get_Struct(rbce->upload, ruby_curl_upload, rbcu);
-    VALUE str = rb_funcall(stream, rb_intern("to_s"), 0);
-    size_t len = RSTRING_LEN(str);
-    size_t remaining = len - rbcu->offset;
-    char *str_ptr = RSTRING_PTR(str);
+    str = rb_funcall(stream, rb_intern("to_s"), 0);
+    len = RSTRING_LEN(str);
+    remaining = len - rbcu->offset;
+    str_ptr = RSTRING_PTR(str);
     if( remaining < read_bytes ) {
       if( remaining > 0 ) {
         memcpy(ptr, str_ptr+rbcu->offset, remaining);
@@ -137,7 +141,7 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->header_data);
   rb_gc_mark(rbce->progress_proc);
   rb_gc_mark(rbce->debug_proc);
-  rb_gc_mark(rbce->interface);
+  rb_gc_mark(rbce->interface_hm);
   rb_gc_mark(rbce->userpwd);
   rb_gc_mark(rbce->proxypwd);
   rb_gc_mark(rbce->headers);
@@ -192,10 +196,11 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   CURLcode ecode;
   VALUE url, blk;
   VALUE new_curl;
+  ruby_curl_easy *rbce;
 
   rb_scan_args(argc, argv, "01&", &url, &blk);
 
-  ruby_curl_easy *rbce = ALLOC(ruby_curl_easy);
+  rbce = ALLOC(ruby_curl_easy);
 
   /* handler */
   rbce->curl = curl_easy_init();
@@ -209,7 +214,7 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->header_proc = Qnil;
   rbce->progress_proc = Qnil;
   rbce->debug_proc = Qnil;
-  rbce->interface = Qnil;
+  rbce->interface_hm = Qnil;
   rbce->userpwd = Qnil;
   rbce->proxypwd = Qnil;
   rbce->headers = rb_hash_new();
@@ -404,8 +409,8 @@ static VALUE ruby_curl_easy_headers_get(VALUE self) {
  * Set the interface name to use as the outgoing network interface.
  * The name can be an interface name, an IP address or a host name.
  */
-static VALUE ruby_curl_easy_interface_set(VALUE self, VALUE interface) {
-  CURB_OBJECT_SETTER(ruby_curl_easy, interface);
+static VALUE ruby_curl_easy_interface_set(VALUE self, VALUE interface_hm) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, interface_hm);
 }
 
 /*
@@ -416,7 +421,7 @@ static VALUE ruby_curl_easy_interface_set(VALUE self, VALUE interface) {
  * The name can be an interface name, an IP address or a host name.
  */
 static VALUE ruby_curl_easy_interface_get(VALUE self) {
-  CURB_OBJECT_GETTER(ruby_curl_easy, interface);
+  CURB_OBJECT_GETTER(ruby_curl_easy, interface_hm);
 }
 
 /*
@@ -716,10 +721,11 @@ static VALUE ruby_curl_easy_post_body_get(VALUE self) {
 static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
   ruby_curl_easy *rbce;
   CURL *curl;
-  
+  VALUE upload;
+
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
-  VALUE upload = ruby_curl_upload_new(cCurlUpload);
+  upload = ruby_curl_upload_new(cCurlUpload);
   ruby_curl_upload_stream_set(upload,data);
 
   curl = rbce->curl;
@@ -745,10 +751,11 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
   if (rb_respond_to(data, rb_intern("read"))) {
     VALUE stat = rb_funcall(data, rb_intern("stat"), 0);
     if( stat ) {
+      VALUE size;
       if( rb_hash_aref(rbce->headers, rb_str_new2("Expect")) == Qnil ) {
         rb_hash_aset(rbce->headers, rb_str_new2("Expect"), rb_str_new2(""));
       }
-      VALUE size = rb_funcall(stat, rb_intern("size"), 0);
+      size = rb_funcall(stat, rb_intern("size"), 0);
       curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2INT(size));
     }
     else if( rb_hash_aref(rbce->headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
@@ -1474,6 +1481,7 @@ static VALUE cb_each_http_header(VALUE header, struct curl_slist **list) {
 VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *header_buffer, struct curl_slist **hdrs ) {
   // TODO this could do with a bit of refactoring...
   CURL *curl;
+  VALUE url;
 
   curl = rbce->curl;
 
@@ -1481,14 +1489,14 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
     rb_raise(eCurlErrError, "No URL supplied");
   }
 
-  VALUE url = rb_check_string_type(rbce->url);
+  url = rb_check_string_type(rbce->url);
 
   // Need to configure the handler as per settings in rbce
   curl_easy_setopt(curl, CURLOPT_URL, StringValuePtr(url));
 
   // network stuff and auth
-  if (rbce->interface != Qnil) {
-    curl_easy_setopt(curl, CURLOPT_INTERFACE, StringValuePtr(rbce->interface));
+  if (rbce->interface_hm != Qnil) {
+    curl_easy_setopt(curl, CURLOPT_INTERFACE, StringValuePtr(rbce->interface_hm));
   } else {
     curl_easy_setopt(curl, CURLOPT_INTERFACE, NULL);
   }
@@ -1768,9 +1776,10 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, VALUE bodybuf, V
  */
 static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
 
+  VALUE ret;
   VALUE multi = ruby_curl_multi_new(cCurlMulti);
   ruby_curl_multi_add(multi, self);
-  VALUE ret = rb_funcall(multi, rb_intern("perform"), 0);
+  ret = rb_funcall(multi, rb_intern("perform"), 0);
 
   /* check for errors in the easy response and raise exceptions if anything went wrong and their is no on_failure handler */
   if( rbce->last_result != 0 && rbce->failure_proc == Qnil ) {
@@ -1811,13 +1820,14 @@ static VALUE ruby_curl_easy_perform_get(VALUE self) {
 static VALUE ruby_curl_easy_perform_delete(VALUE self) {
   ruby_curl_easy *rbce;
   CURL *curl;
+  VALUE retval;
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
 
-  VALUE retval = handle_perform(self,rbce);
+  retval = handle_perform(self,rbce);
 
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
 
@@ -1921,13 +1931,14 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
 static VALUE ruby_curl_easy_perform_head(VALUE self) {
   ruby_curl_easy *rbce;
   CURL *curl;
+  VALUE ret;
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
   curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
 
-  VALUE ret = handle_perform(self,rbce);
+  ret = handle_perform(self,rbce);
 
   curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
   return ret;
@@ -2748,10 +2759,11 @@ static VALUE ruby_curl_easy_class_perform_head(int argc, VALUE *argv, VALUE klas
  */
 static VALUE ruby_curl_easy_class_perform_post(int argc, VALUE *argv, VALUE klass) {
   VALUE url, fields;
+  VALUE c;
 
   rb_scan_args(argc, argv, "1*", &url, &fields);
 
-  VALUE c = ruby_curl_easy_new(1, &url, klass);
+  c = ruby_curl_easy_new(1, &url, klass);
 
   if (argc > 1) {
     ruby_curl_easy_perform_post(argc - 1, &argv[1], c);

data/ext/curb_easy.h

@@ -28,7 +28,7 @@ typedef struct {
   VALUE header_data;    /* unless a block is supplied (they'll be nil)      */
   VALUE progress_proc;
   VALUE debug_proc;
-  VALUE interface;
+  VALUE interface_hm;
   VALUE userpwd;
   VALUE proxypwd;
   VALUE headers;        /* ruby array of strings with headers to set */

data/ext/curb_errors.c

@@ -124,6 +124,7 @@ VALUE eCurlErrInvalidPostField;
 VALUE rb_curl_easy_error(CURLcode code) {
   VALUE exclz;
   const char *exmsg = NULL;
+  VALUE results;
 
   switch (code) {
     case CURLE_UNSUPPORTED_PROTOCOL:    /* 1 */
@@ -436,7 +437,7 @@ VALUE rb_curl_easy_error(CURLcode code) {
     exmsg = curl_easy_strerror(code);
   }
 
-  VALUE results = rb_ary_new2(2);
+  results = rb_ary_new2(2);
   rb_ary_push(results, exclz);
   rb_ary_push(results, rb_str_new2(exmsg));
   return results;
@@ -449,6 +450,7 @@ void raise_curl_easy_error_exception(CURLcode code) {
 VALUE rb_curl_multi_error(CURLMcode code) {
   VALUE exclz;
   const char *exmsg = NULL;
+  VALUE results;
 
   switch(code) {
     case CURLM_CALL_MULTI_PERFORM: /* -1 */
@@ -485,9 +487,10 @@ VALUE rb_curl_multi_error(CURLMcode code) {
     exmsg = curl_multi_strerror(code);
   }
 
-  VALUE results = rb_ary_new2(2);
+  results = rb_ary_new2(2);
   rb_ary_push(results, exclz);
   rb_ary_push(results, rb_str_new2(exmsg));
+
   return results;
 }
 void raise_curl_multi_error_exception(CURLMcode code) {
@@ -597,6 +600,14 @@ void init_curb_errors() {
   eCurlErrSSLShutdownFailed  = rb_define_class_under(mCurlErr, "SSLShutdownFailed", eCurlErrError);
   eCurlErrSSH                = rb_define_class_under(mCurlErr, "SSH", eCurlErrError);
 
+  mCurlErrCallMultiPerform   = rb_define_class_under(mCurlErr, "MultiPerform", eCurlErrError);
+  mCurlErrBadHandle          = rb_define_class_under(mCurlErr, "MultiBadHandle", eCurlErrError);
+  mCurlErrBadEasyHandle      = rb_define_class_under(mCurlErr, "MultiBadEasyHandle", eCurlErrError);
+  mCurlErrOutOfMemory        = rb_define_class_under(mCurlErr, "MultiOutOfMemory", eCurlErrError);
+  mCurlErrInternalError      = rb_define_class_under(mCurlErr, "MultiInternalError", eCurlErrError);
+  mCurlErrBadSocket          = rb_define_class_under(mCurlErr, "MultiBadSocket", eCurlErrError);
+  mCurlErrUnknownOption      = rb_define_class_under(mCurlErr, "MultiUnknownOption", eCurlErrError);
+
   eCurlErrLDAPInvalidURL = rb_define_class_under(mCurlErr, "InvalidLDAPURLError", eCurlErrLDAPError);
 
   eCurlErrFileSizeExceeded = rb_define_class_under(mCurlErr, "FileSizeExceededError", eCurlErrError);

data/ext/curb_multi.c

@@ -45,13 +45,14 @@ static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm)
   //rb_curl_multi_remove(rbcm, easy);
   CURLMcode result;
   ruby_curl_easy *rbce;
+  VALUE r;
   Data_Get_Struct(easy, ruby_curl_easy, rbce);
   result = curl_multi_remove_handle(rbcm->handle, rbce->curl);
   if (result != 0) {
     raise_curl_multi_error_exception(result);
   }
   // XXX: easy handle may not be finished yet... so don't clean it GC pass will get it next time
-  VALUE r = rb_hash_delete( rbcm->requests, easy );
+  r = rb_hash_delete( rbcm->requests, easy );
   if( r != easy || r == Qnil ) {
     rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
   }
@@ -114,10 +115,11 @@ static int ruby_curl_multi_requests_callback(VALUE key, VALUE value, VALUE resul
  */
 static VALUE ruby_curl_multi_requests(VALUE self) {
   ruby_curl_multi *rbcm;
-  
+  VALUE result_array;
+
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
   
-  VALUE result_array = rb_ary_new();
+  result_array = rb_ary_new();
   
   // iterate over the requests hash, and stuff references into the array.
   rb_hash_foreach( rbcm->requests, ruby_curl_multi_requests_callback, result_array );
@@ -242,10 +244,10 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
  */
 VALUE ruby_curl_multi_remove(VALUE self, VALUE easy) {
   ruby_curl_multi *rbcm;
+  ruby_curl_easy *rbce;
 
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
 
-  ruby_curl_easy *rbce;
   Data_Get_Struct(easy, ruby_curl_easy, rbce);
 
   rb_curl_multi_remove(rbcm,easy);
@@ -255,23 +257,23 @@ VALUE ruby_curl_multi_remove(VALUE self, VALUE easy) {
 static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   CURLMcode result;
   ruby_curl_easy *rbce;
-  Data_Get_Struct(easy, ruby_curl_easy, rbce);
-
-  rbcm->active--;
+  VALUE r;
 
-  //printf( "calling rb_curl_multi_remove: 0x%X, active: %d\n", (long)easy, rbcm->active );
+  Data_Get_Struct(easy, ruby_curl_easy, rbce);
 
   result = curl_multi_remove_handle(rbcm->handle, rbce->curl);
   if (result != 0) {
     raise_curl_multi_error_exception(result);
   }
 
+  rbcm->active--;
+
   ruby_curl_easy_cleanup( easy, rbce, rbce->bodybuf, rbce->headerbuf, rbce->curl_headers );
   rbce->headerbuf = Qnil;
   rbce->bodybuf = Qnil;
 
   // active should equal INT2FIX(RHASH(rbcm->requests)->tbl->num_entries)
-  VALUE r = rb_hash_delete( rbcm->requests, easy );
+  r = rb_hash_delete( rbcm->requests, easy );
   if( r != easy || r == Qnil ) {
     rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
   }
@@ -305,7 +307,7 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   long response_code = -1;
   ruby_curl_easy *rbce = NULL;
-
+  VALUE ref;
   CURLcode ecode = curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, (char**)&rbce);
 
   if (ecode != 0) {
@@ -322,21 +324,24 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   curl_easy_getinfo(rbce->curl, CURLINFO_RESPONSE_CODE, &response_code);
 
+  ref = rbce->self;
+  /* break reference */
+  rbce->self = Qnil;
+
   if (result != 0) {
     if (rbce->failure_proc != Qnil) {
-      rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
+      rb_funcall( rbce->failure_proc, idCall, 2, ref, rb_curl_easy_error(result) );
     }
   }
   else if (rbce->success_proc != Qnil &&
           ((response_code >= 200 && response_code < 300) || response_code == 0)) {
     /* NOTE: we allow response_code == 0, in the case of non http requests e.g. reading from disk */
-    rb_funcall( rbce->success_proc, idCall, 1, rbce->self );
+    rb_funcall( rbce->success_proc, idCall, 1, ref );
   }
   else if (rbce->failure_proc != Qnil &&
           (response_code >= 300 && response_code <= 999)) {
-    rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
+    rb_funcall( rbce->failure_proc, idCall, 2, ref, rb_curl_easy_error(result) );
   }
-  rbce->self = Qnil;
 }
 
 static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {

data/ext/curb_postfield.c

@@ -480,6 +480,8 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
 
 /* =================== INIT LIB =====================*/
 void init_curb_postfield() {
+  VALUE sc;
+
   idCall = rb_intern("call");
   
   cCurlPostField = rb_define_class_under(mCurl, "PostField", rb_cObject);
@@ -488,7 +490,7 @@ void init_curb_postfield() {
   rb_define_singleton_method(cCurlPostField, "content", ruby_curl_postfield_new_content, -1);
   rb_define_singleton_method(cCurlPostField, "file", ruby_curl_postfield_new_file, -1);
   
-  VALUE sc = rb_singleton_class(cCurlPostField);
+  sc = rb_singleton_class(cCurlPostField);
   rb_undef(sc, rb_intern("new"));
   
   rb_define_method(cCurlPostField, "name=", ruby_curl_postfield_name_set, 1);

data/ext/extconf.rb

@@ -4,10 +4,16 @@ dir_config('curl')
 
 if find_executable('curl-config')
   $CFLAGS << " #{`curl-config --cflags`.strip}"
-  $LIBS << " #{`curl-config --libs`.strip}"
+  if ENV['STATIC_BUILD']
+    $LIBS << " #{`curl-config --static-libs`.strip}"
+  else
+    $LIBS << " #{`curl-config --libs`.strip}"
+  end
   ca_bundle_path=`curl-config --ca`.strip
-  $defs.push( %{-D HAVE_CURL_CONFIG_CA} )
-  $defs.push( %{-D CURL_CONFIG_CA='#{ca_bundle_path.inspect}'} )
+  if !ca_bundle_path.nil? and ca_bundle_path != ''
+    $defs.push( %{-D HAVE_CURL_CONFIG_CA} )
+    $defs.push( %{-D CURL_CONFIG_CA='#{ca_bundle_path.inspect}'} )
+  end
 elsif !have_library('curl') or !have_header('curl/curl.h')
   fail <<-EOM
   Can't find libcurl or curl/curl.h
@@ -17,6 +23,17 @@ elsif !have_library('curl') or !have_header('curl/curl.h')
   EOM
 end
 
+# Check arch flags
+archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
+if archs and archs.size >= 1
+  # need to reduce the number of archs...
+  # guess the first one is correct... at least the first one is probably the ruby installed arch...
+  # this could lead to compiled binaries that crash at runtime...
+  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
+  $CFLAGS << " -arch #{archs.first}"
+  puts "Selected arch: #{archs.first}"
+end
+
 def define(s)
   $defs.push( format("-D HAVE_%s", s.to_s.upcase) )
 end

data/tests/bug_multi_segfault.rb

@@ -0,0 +1,10 @@
+# From safis  http://github.com/taf2/curb/issues#issue/5
+# irb: require 'curb'
+# irb: multi = Curl::Multi.new
+# irb: exit
+# <main>:47140: [BUG] Bus Error
+$:.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

data/tests/tc_curl_download.rb

@@ -9,7 +9,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   
   def test_download_url_to_file
     dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
-    dl_path = File.join("/tmp/dl_url_test.file")
+    dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
     assert File.exist?(dl_path)
@@ -20,7 +20,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
 
   def test_download_bad_url_gives_404
     dl_url = "http://127.0.0.1:9129/this_file_does_not_exist.html"
-    dl_path = File.join("/tmp/dl_url_test.file")
+    dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
     assert_equal Curl::Easy, curb.class

data/tests/tc_curl_multi.rb

@@ -379,6 +379,39 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     assert_equal "POST\nhello=world", e2.body_str
   end
 
+  def test_remove_exception_is_descriptive
+    m = Curl::Multi.new
+    c = Curl::Easy.new("http://blah.com")
+    m.remove(c)
+  rescue => e
+    assert_equal 'Invalid easy handle', e.message
+    assert_equal 0, m.requests.size
+  end
+
+  def test_retry_easy_handle
+    m = Curl::Multi.new
+
+    tries = 2
+
+    c1 = Curl::Easy.new('http://127.9.9.9') do |curl|
+      curl.on_failure {|c,e|
+        assert_equal [Curl::Err::ConnectionFailedError, "Couldn't connect to server"], e
+        if tries > 0
+          tries -= 1
+          m.add(c)
+        end
+      }
+    end
+
+    tries -= 1
+    m.add(c1)
+
+    while not m.requests.empty?
+      m.perform
+    end
+    assert_equal 0, tries
+  end
+
   include TestServerMethods 
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.4.0
+  version: 0.5.7.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 -04:00
+date: 2009-11-23 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,22 +29,21 @@ files:
 - Rakefile
 - doc.rb
 - ext/extconf.rb
-- lib/curb.rb
 - lib/curl.rb
+- lib/curb.rb
 - ext/curb.c
+- ext/curb_upload.c
+- ext/curb_postfield.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_config.h
-- ext/curb_easy.h
+- ext/curb_errors.c
 - ext/curb_errors.h
-- ext/curb_macros.h
 - ext/curb_multi.h
+- ext/curb.h
+- ext/curb_easy.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
+- ext/curb_macros.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -71,19 +70,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: curb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/alltests.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_require_last_or_segfault.rb
 - tests/helper.rb
+- tests/tc_curl_postfield.rb
+- tests/bug_instance_post_differs_from_class_post.rb
+- tests/bug_multi_segfault.rb
+- tests/alltests.rb
 - tests/require_last_or_segfault_script.rb
+- tests/unittests.rb
+- tests/tc_curl_multi.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb

data/ext/curb_config.h

@@ -1,59 +0,0 @@
-#ifndef CURB_CONFIG_H
-#define CURB_CONFIG_H
-#define  HAVE_CURL_CONFIG_CA 1
-#define  CURL_CONFIG_CA ""
-#define  HAVE_CURLINFO_REDIRECT_TIME 1
-#define  HAVE_CURLINFO_RESPONSE_CODE 1
-#define  HAVE_CURLINFO_FILETIME 1
-#define  HAVE_CURLINFO_REDIRECT_COUNT 1
-#define  HAVE_CURLINFO_OS_ERRNO 1
-#define  HAVE_CURLINFO_NUM_CONNECTS 1
-#define  HAVE_CURLINFO_FTP_ENTRY_PATH 1
-#define  HAVE_CURL_VERSION_SSL 1
-#define  HAVE_CURL_VERSION_LIBZ 1
-#define  HAVE_CURL_VERSION_NTLM 1
-#define  HAVE_CURL_VERSION_GSSNEGOTIATE 1
-#define  HAVE_CURL_VERSION_DEBUG 1
-#define  HAVE_CURL_VERSION_ASYNCHDNS 1
-#define  HAVE_CURL_VERSION_SPNEGO 1
-#define  HAVE_CURL_VERSION_LARGEFILE 1
-#define  HAVE_CURL_VERSION_IDN 1
-#define  HAVE_CURL_VERSION_SSPI 1
-#define  HAVE_CURL_VERSION_CONV 1
-#define  HAVE_CURLPROXY_HTTP 1
-#define  HAVE_CURLPROXY_SOCKS4 1
-#define  HAVE_CURLPROXY_SOCKS5 1
-#define  HAVE_CURLAUTH_BASIC 1
-#define  HAVE_CURLAUTH_DIGEST 1
-#define  HAVE_CURLAUTH_GSSNEGOTIATE 1
-#define  HAVE_CURLAUTH_NTLM 1
-#define  HAVE_CURLAUTH_ANYSAFE 1
-#define  HAVE_CURLAUTH_ANY 1
-#define  HAVE_CURLE_TFTP_NOTFOUND 1
-#define  HAVE_CURLE_TFTP_PERM 1
-#define  HAVE_CURLE_TFTP_DISKFULL 1
-#define  HAVE_CURLE_TFTP_ILLEGAL 1
-#define  HAVE_CURLE_TFTP_UNKNOWNID 1
-#define  HAVE_CURLE_TFTP_EXISTS 1
-#define  HAVE_CURLE_TFTP_NOSUCHUSER 1
-#define  HAVE_CURLE_SEND_FAIL_REWIND 1
-#define  HAVE_CURLE_SSL_ENGINE_INITFAILED 1
-#define  HAVE_CURLE_LOGIN_DENIED 1
-#define  HAVE_CURLMOPT_MAXCONNECTS 1
-#define  HAVE_CURLE_CONV_FAILED 1
-#define  HAVE_CURLE_CONV_REQD 1
-#define  HAVE_CURLE_SSL_CACERT_BADFILE 1
-#define  HAVE_CURLE_REMOTE_FILE_NOT_FOUND 1
-#define  HAVE_CURLE_SSH 1
-#define  HAVE_CURLE_SSL_SHUTDOWN_FAILED 1
-#define  HAVE_CURLE_AGAIN 1
-#define  HAVE_CURLE_SSL_CRL_BADFILE 1
-#define  HAVE_CURLE_SSL_ISSUER_ERROR 1
-#define  HAVE_CURLM_BAD_SOCKET 1
-#define  HAVE_CURLM_UNKNOWN_OPTION 1
-#define HAVE_CURL_MULTI_TIMEOUT 1
-#define HAVE_CURL_MULTI_FDSET 1
-#define HAVE_CURL_MULTI_PERFORM 1
-#define  HAVE_RUBY19_ST_H 1
-#define  HAVE_CURL_EASY_ESCAPE 1
-#endif