curb 0.7.16 → 0.7.17

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/clean'
 require 'rake/testtask'
 begin
   require 'rdoc/task'
-rescue LoadError
+rescue LoadError => e
   require 'rake/rdoctask'
 end
 

data/ext/curb.c

@@ -363,12 +363,24 @@ void Init_curb_core() {
   CURB_DEFINE(CURLOPT_READDATA);
   CURB_DEFINE(CURLOPT_IOCTLFUNCTION);
   CURB_DEFINE(CURLOPT_IOCTLDATA);
+#if HAVE_CURLOPT_SEEKFUNCTION
   CURB_DEFINE(CURLOPT_SEEKFUNCTION);
+#endif
+#if HAVE_CURLOPT_SEEKDATA
   CURB_DEFINE(CURLOPT_SEEKDATA);
+#endif
+#if HAVE_CURLOPT_SOCKOPTFUNCTION
   CURB_DEFINE(CURLOPT_SOCKOPTFUNCTION);
+#endif
+#if HAVE_CURLOPT_SOCKOPTDATA
   CURB_DEFINE(CURLOPT_SOCKOPTDATA);
+#endif
+#if HAVE_CURLOPT_OPENSOCKETFUNCTION
   CURB_DEFINE(CURLOPT_OPENSOCKETFUNCTION);
+#endif
+#if HAVE_CURLOPT_OPENSOCKETDATA
   CURB_DEFINE(CURLOPT_OPENSOCKETDATA);
+#endif
   CURB_DEFINE(CURLOPT_PROGRESSFUNCTION);
   CURB_DEFINE(CURLOPT_PROGRESSDATA);
   CURB_DEFINE(CURLOPT_HEADERFUNCTION);
@@ -838,9 +850,6 @@ void Init_curb_core() {
 #if HAVE_CURLOPT_SSLVERSION
   CURB_DEFINE(CURLOPT_SSLVERSION);
 #endif
-#if HAVE_CURL_SSLVERSION_DEFAULT
-  CURB_DEFINE(CURL_SSLVERSION_DEFAULT);
-#endif
 #if HAVE_CURL_SSLVERSION_TLSv1
   CURB_DEFINE(CURL_SSLVERSION_TLSv1);
 #endif

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.7.16"
-#define CURB_VER_NUM   716
+#define CURB_VERSION   "0.7.17"
+#define CURB_VER_NUM   717
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
 #define CURB_VER_MIC   1
-#define CURB_VER_PATCH 6
+#define CURB_VER_PATCH 7
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -54,7 +54,7 @@ static size_t read_data_handler(void *ptr,
     /* copy read_bytes from stream into ptr */
     VALUE str = rb_funcall(stream, rb_intern("read"), 1, rb_int_new(read_bytes) );
     if( str != Qnil ) {
-      memcpy(ptr, RSTRING_PTR(str), RSTRING_LEN(str));
+      memcpy(ptr, StringValueCStr(str), RSTRING_LEN(str));
       return RSTRING_LEN(str);
     }
     else {
@@ -71,7 +71,7 @@ static size_t read_data_handler(void *ptr,
     str = rb_funcall(stream, rb_intern("to_s"), 0);
     len = RSTRING_LEN(str);
     remaining = len - rbcu->offset;
-    str_ptr = RSTRING_PTR(str);
+    str_ptr = StringValueCStr(str);
 
     if( remaining < read_bytes ) {
       if( remaining > 0 ) {
@@ -157,11 +157,13 @@ static int proc_debug_handler(CURL *curl,
                               char *data,
                               size_t data_len,
                               VALUE proc) {
+  VALUE procret;
   VALUE callargs = rb_ary_new2(3);
   rb_ary_store(callargs, 0, proc);
   rb_ary_store(callargs, 1, INT2FIX(type));
   rb_ary_store(callargs, 2, rb_str_new(data, data_len));
   rb_rescue(call_debug_handler, callargs, callback_exception, Qnil);
+  // XXX: no way to indicate to libcurl that we should break out given an exception in the on_debug handler... this means exceptions will be swallowed
   //rb_funcall(proc, idCall, 2, INT2FIX(type), rb_str_new(data, data_len));
   return 0;
 }
@@ -222,7 +224,7 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->proxy_tunnel = 0;
   rbce->fetch_file_time = 0;
   rbce->ssl_verify_peer = 1;
-  rbce->ssl_verify_host = 1;
+  rbce->ssl_verify_host = 2;
   rbce->header_in_body = 0;
   rbce->use_netrc = 0;
   rbce->follow_location = 0;
@@ -1957,12 +1959,12 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   curl_easy_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, rbce->proxy_tunnel);
   curl_easy_setopt(curl, CURLOPT_FILETIME, rbce->fetch_file_time);
   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, rbce->ssl_verify_peer);
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, rbce->ssl_verify_peer);
+  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, rbce->ssl_verify_host);
 
   if ((rbce->use_netrc != Qnil) && (rbce->use_netrc != Qfalse)) {
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, CURL_NETRC_OPTIONAL);
+    curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
   } else {
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, CURL_NETRC_IGNORED);
+    curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_IGNORED);
   }
 
   curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, rbce->unrestricted_auth);
@@ -2233,11 +2235,11 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
 static VALUE ruby_curl_easy_perform_verb(VALUE self, VALUE verb) {
   VALUE str_verb;
   if (rb_type(verb) == T_STRING) {
-    return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(verb));
+    return ruby_curl_easy_perform_verb_str(self, StringValueCStr(verb));
   }
   else if (rb_respond_to(verb,rb_intern("to_s"))) {
     str_verb = rb_funcall(verb, rb_intern("to_s"), 0);
-    return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(str_verb));
+    return ruby_curl_easy_perform_verb_str(self, StringValueCStr(str_verb));
   }
   else {
     rb_raise(rb_eRuntimeError, "Invalid HTTP VERB, must response to 'to_s'");
@@ -3106,7 +3108,7 @@ static VALUE ruby_curl_easy_inspect(VALUE self) {
     size_t len = 13+((RSTRING_LEN(url) > 50) ? 50 : RSTRING_LEN(url));
     /* "#<Net::HTTP http://www.google.com/:80 open=false>" */
     memcpy(buf,"#<Curl::Easy ", 13);
-    memcpy(buf+13,RSTRING_PTR(url), (len - 13));
+    memcpy(buf+13,StringValueCStr(url), (len - 13));
     buf[len++] = '>';
     return rb_str_new(buf,len);
   }

data/ext/curb_multi.c

@@ -332,7 +332,7 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
   long response_code = -1;
   VALUE easy;
   ruby_curl_easy *rbce = NULL;
-  VALUE callargs;
+  VALUE callargs, val = Qtrue;
 
   CURLcode ecode = curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, (char**)&easy);
 
@@ -354,7 +354,7 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   if (!rb_easy_nil("complete_proc")) {
     callargs = rb_ary_new3(2, rb_easy_get("complete_proc"), easy);
-    rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
+    val = rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
     //rb_funcall( rb_easy_get("complete_proc"), idCall, 1, easy );
   }
 
@@ -363,7 +363,7 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
   if (result != 0) {
     if (!rb_easy_nil("failure_proc")) {
       callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
-      rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
+      val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
       //rb_funcall( rb_easy_get("failure_proc"), idCall, 2, easy, rb_curl_easy_error(result) );
     }
   }
@@ -371,16 +371,22 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
           ((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 */
     callargs = rb_ary_new3(2, rb_easy_get("success_proc"), easy);
-    rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
+    val = rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
     //rb_funcall( rb_easy_get("success_proc"), idCall, 1, easy );
   }
   else if (!rb_easy_nil("failure_proc") &&
           (response_code >= 300 && response_code <= 999)) {
     callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
-    rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
+    val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
     //rb_funcall( rb_easy_get("failure_proc"), idCall, 2, easy, rb_curl_easy_error(result) );
   }
 
+  if (val == Qfalse) {
+    rb_warn("uncaught exception from callback");
+      // exception was raised?
+    //fprintf(stderr, "exception raised from callback\n");
+  }
+
 }
 
 static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
@@ -443,6 +449,20 @@ void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
 }
 #endif
 
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+struct _select_set {
+  int maxfd;
+  fd_set *fdread, *fdwrite, *fdexcep;
+  struct timeval *tv;
+};
+
+static VALUE curb_select(void *args) {
+  struct _select_set* set = args;
+  int rc = select(set->maxfd, set->fdread, set->fdwrite, set->fdexcep, set->tv);
+  return INT2FIX(rc);
+}
+#endif
+
 /*
  * call-seq:
  * multi = Curl::Multi.new
@@ -466,10 +486,12 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 #ifdef _WIN32
   fd_set crt_fdread, crt_fdwrite, crt_fdexcep;
 #endif
-
   long timeout_milliseconds;
   struct timeval tv = {0, 0};
   VALUE block = Qnil;
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+  struct _select_set fdset_args;
+#endif
 
   rb_scan_args(argc, argv, "0&", &block);
 
@@ -526,7 +548,16 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
       create_crt_fd(&fdexcep, &crt_fdexcep);
 #endif
 
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+      fdset_args.maxfd = maxfd+1;
+      fdset_args.fdread = &fdread;
+      fdset_args.fdwrite = &fdwrite;
+      fdset_args.fdexcep = &fdexcep;
+      fdset_args.tv = &tv;
+      rc = rb_thread_blocking_region(curb_select, &fdset_args, RUBY_UBF_IO, 0);
+#else
       rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
+#endif
 
 #ifdef _WIN32
       cleanup_crt_fd(&fdread, &crt_fdread);

data/ext/extconf.rb

@@ -101,6 +101,13 @@ have_constant "curle_login_denied"
 # older than 7.16.3
 have_constant "curlmopt_maxconnects"
 
+have_constant "curlopt_seekfunction"
+have_constant "curlopt_seekdata"
+have_constant "curlopt_sockoptfunction"
+have_constant "curlopt_sockoptdata"
+have_constant "curlopt_opensocketfunction"
+have_constant "curlopt_opensocketdata"
+
 # additional consts
 have_constant "curle_conv_failed"
 have_constant "curle_conv_reqd"
@@ -381,5 +388,7 @@ test_for("curl_easy_escape", "CURL_EASY_ESCAPE", %{
   }
 })
 
+have_func('rb_thread_blocking_region')
+
 create_header('curb_config.h')
 create_makefile('curb_core')

data/tests/{bug_crash_on_debug.rb → bug_crash_on_progress.rb}

@@ -20,14 +20,14 @@ class BugCrashOnDebug < Test::Unit::TestCase
     c.on_progress do|x|
       raise "error"
     end
-    c.easy.on_debug { |type, data| puts "debug: #{type.inspect}, #{data.inspect}" }
     c.perform
 
+    assert false, "should not reach this point"
+
   rescue => e
     assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
     c.close
   ensure
-    puts "shutdown server"
     server.shutdown
   end
 end

data/tests/tc_curl_easy.rb

@@ -918,24 +918,31 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal multi, easy.multi
   end
 
-  def test_handle_exceptions_in_progress_callbacks
+  def test_raise_on_progress
     c = Curl::Easy.new($TEST_URL)
-    c.on_progress {|x| raise "error" }
+    c.on_progress {|w,x,y,z| raise "error" }
     c.perform
   rescue => e
     assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
     c.close
   end
 
-  def test_handle_exceptions_in_debug_callbacks
+  def test_raise_on_success
     c = Curl::Easy.new($TEST_URL)
-    c.on_debug {|x| raise "error" }
+    c.on_success {|x| raise "error" }
     c.perform
   rescue => e
     assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
     c.close
   end
 
+  def test_raise_on_debug
+    c = Curl::Easy.new($TEST_URL)
+    c.on_debug { raise "error" }
+    c.perform
+    assert true, "raise in on debug has no effect"
+  end
+
   include TestServerMethods 
 
   def setup

metadata

@@ -1,28 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: curb
-version: !ruby/object:Gem::Version
-  version: 0.7.16
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 33
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 17
+  version: 0.7.17
 platform: ruby
-authors:
+authors: 
 - Ross Bamford
 - Todd A. Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000 Z
+
+date: 2012-01-09 00:00:00 -05:00
+default_executable: 
 dependencies: []
-description: 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/
+
+description: 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/
 email: todd.fisher@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - LICENSE
 - README
-files:
+files: 
 - LICENSE
 - README
 - Rakefile
@@ -46,7 +53,7 @@ files:
 - ext/curb_postfield.h
 - ext/curb_upload.h
 - tests/alltests.rb
-- tests/bug_crash_on_debug.rb
+- tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
@@ -66,36 +73,45 @@ files:
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
+has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: curb
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
-test_files:
+test_files: 
 - tests/alltests.rb
-- tests/bug_crash_on_debug.rb
+- tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb