curb 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b338d766fda8dfadab0c602cdad4a9f15a529bb495725b15ca5def63a9d8390a
-  data.tar.gz: 5b074f1154e3da7ce37eee89e6e5a577a2c09202b6baee72afd2098eac986bd7
+  metadata.gz: fbb34677764658fa7e245af071bc04109f4928469a55e7bb9637678b5517e331
+  data.tar.gz: e71501d928f2d44943a097b648525b24ce93427507800ffa7e2fd481b6a84593
 SHA512:
-  metadata.gz: 59a25fdf7add62512432495a89d6c8832513ecbc94bb14e7e5720abbfbfea24e0ae52c77fe10497871c6683f39e6988ff184088318e06a14848ab764db38bea2
-  data.tar.gz: 4fc8fb4b8111f102107cabc002f1b1a11d2f73e9b66d188ebaf3027a803c90868184c751a3448639bf23ca62eace0a227769aff716a4ba0a8a39b23888346097
+  metadata.gz: bba51087a045a85954cb6b5470ae3f0fc2e8442489fd5a81f1d9e9ee4800e674156510d9a8cf6fd86daa66d18938ea50a5f625fa3fccf1db055faf58177455b2
+  data.tar.gz: 67696266ddd2d0081b514b7a5a9bf81ea61c474ad0d8423e6d61db5cdba614c01dca14ed7a512cf52ca609db7bc5317828e1f033004ffdef6e6f3f7e09f63dbb

data/Rakefile

@@ -2,6 +2,7 @@
 # 
 require 'rake/clean'
 require 'rake/testtask'
+require "ruby_memcheck"
 
 CLEAN.include '**/*.o'
 CLEAN.include "**/*.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
@@ -90,6 +91,14 @@ else
   task :alltests => [:unittests, :bugtests]
 end
 
+RubyMemcheck.config(binary_name: 'curb_core')
+namespace :test do
+  RubyMemcheck::TestTask.new(valgrind: :compile) do|t|
+    t.test_files = FileList['tests/tc_*.rb']
+    t.verbose = false
+  end
+end
+
 Rake::TestTask.new(:unittests) do |t|
   t.test_files = FileList['tests/tc_*.rb']
   t.verbose = false

data/ext/curb.h

@@ -28,11 +28,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "1.0.2"
-#define CURB_VER_NUM   1002
+#define CURB_VERSION   "1.0.4"
+#define CURB_VER_NUM   1004
 #define CURB_VER_MAJ   1
 #define CURB_VER_MIN   0
-#define CURB_VER_MIC   2
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -34,7 +34,7 @@ static FILE * rb_io_stdio_file(rb_io_t *fptr) {
 
 /* ================== CURL HANDLER FUNCS ==============*/
 
-static VALUE callback_exception(VALUE unused) {
+static VALUE callback_exception(VALUE unused, VALUE exception) {
   return Qfalse;
 }
 
@@ -1311,7 +1311,7 @@ static VALUE ruby_curl_easy_connect_timeout_set(VALUE self, VALUE connect_timeou
  * Obtain the maximum time in seconds that you allow the connection to the
  * server to take.
  */
-static VALUE ruby_curl_easy_connect_timeout_get(VALUE self, VALUE connect_timeout) {
+static VALUE ruby_curl_easy_connect_timeout_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, connect_timeout, 0);
 }
 
@@ -1337,7 +1337,7 @@ static VALUE ruby_curl_easy_connect_timeout_ms_set(VALUE self, VALUE connect_tim
  * Obtain the maximum time in milliseconds that you allow the connection to the
  * server to take.
  */
-static VALUE ruby_curl_easy_connect_timeout_ms_get(VALUE self, VALUE connect_timeout_ms) {
+static VALUE ruby_curl_easy_connect_timeout_ms_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, connect_timeout_ms, 0);
 }
 
@@ -1360,7 +1360,7 @@ static VALUE ruby_curl_easy_dns_cache_timeout_set(VALUE self, VALUE dns_cache_ti
  *
  * Obtain the dns cache timeout in seconds.
  */
-static VALUE ruby_curl_easy_dns_cache_timeout_get(VALUE self, VALUE dns_cache_timeout) {
+static VALUE ruby_curl_easy_dns_cache_timeout_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, dns_cache_timeout, -1);
 }
 
@@ -1387,7 +1387,7 @@ static VALUE ruby_curl_easy_ftp_response_timeout_set(VALUE self, VALUE ftp_respo
  *
  * Obtain the maximum time that libcurl will wait for FTP command responses.
  */
-static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self, VALUE ftp_response_timeout) {
+static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, ftp_response_timeout, 0);
 }
 
@@ -1410,7 +1410,7 @@ static VALUE ruby_curl_easy_low_speed_limit_set(VALUE self, VALUE low_speed_limi
  * Obtain the minimum transfer speed over +low_speed+time+ below which the
  * transfer will be aborted.
  */
-static VALUE ruby_curl_easy_low_speed_limit_get(VALUE self, VALUE low_speed_limit) {
+static VALUE ruby_curl_easy_low_speed_limit_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, low_speed_limit, 0);
 }
 
@@ -1432,7 +1432,7 @@ static VALUE ruby_curl_easy_low_speed_time_set(VALUE self, VALUE low_speed_time)
  * Obtain the time that the transfer should be below +low_speed_limit+ for
  * the library to abort it.
  */
-static VALUE ruby_curl_easy_low_speed_time_get(VALUE self, VALUE low_speed_time) {
+static VALUE ruby_curl_easy_low_speed_time_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, low_speed_time, 0);
 }
 
@@ -1452,7 +1452,7 @@ static VALUE ruby_curl_easy_max_send_speed_large_set(VALUE self, VALUE max_send_
  *
  * Get the maximal sending transfer speed (in bytes per second) 
  */
-static VALUE ruby_curl_easy_max_send_speed_large_get(VALUE self, VALUE max_send_speed_large) {
+static VALUE ruby_curl_easy_max_send_speed_large_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, max_send_speed_large, 0);
 }
 
@@ -1472,7 +1472,7 @@ static VALUE ruby_curl_easy_max_recv_speed_large_set(VALUE self, VALUE max_recv_
  *
  * Get the maximal receiving transfer speed (in bytes per second) 
  */
-static VALUE ruby_curl_easy_max_recv_speed_large_get(VALUE self, VALUE max_recv_speed_large) {
+static VALUE ruby_curl_easy_max_recv_speed_large_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, max_recv_speed_large, 0);
 }
 
@@ -1496,7 +1496,7 @@ static VALUE ruby_curl_easy_username_set(VALUE self, VALUE username) {
  *
  * Get the current username
  */
-static VALUE ruby_curl_easy_username_get(VALUE self, VALUE username) {
+static VALUE ruby_curl_easy_username_get(VALUE self) {
 #if HAVE_CURLOPT_USERNAME
   CURB_OBJECT_HGETTER(ruby_curl_easy, username);
 #else
@@ -1524,7 +1524,7 @@ static VALUE ruby_curl_easy_password_set(VALUE self, VALUE password) {
  *
  * Get the current password
  */
-static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
+static VALUE ruby_curl_easy_password_get(VALUE self) {
 #if HAVE_CURLOPT_PASSWORD
   CURB_OBJECT_HGETTER(ruby_curl_easy, password);
 #else
@@ -1558,7 +1558,7 @@ static VALUE ruby_curl_easy_ssl_version_set(VALUE self, VALUE ssl_version) {
  *
  * Get the version of SSL/TLS that libcurl will attempt to use.
  */
-static VALUE ruby_curl_easy_ssl_version_get(VALUE self, VALUE ssl_version) {
+static VALUE ruby_curl_easy_ssl_version_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, ssl_version, -1);
 }
 
@@ -1579,7 +1579,7 @@ static VALUE ruby_curl_easy_use_ssl_set(VALUE self, VALUE use_ssl) {
  *
  * Get the desired level for using SSL on FTP connections.
  */
-static VALUE ruby_curl_easy_use_ssl_get(VALUE self, VALUE use_ssl) {
+static VALUE ruby_curl_easy_use_ssl_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, use_ssl, -1);
 }
 
@@ -1600,7 +1600,7 @@ static VALUE ruby_curl_easy_ftp_filemethod_set(VALUE self, VALUE ftp_filemethod)
  *
  * Get the configuration for how libcurl will reach files on the server.
  */
-static VALUE ruby_curl_easy_ftp_filemethod_get(VALUE self, VALUE ftp_filemethod) {
+static VALUE ruby_curl_easy_ftp_filemethod_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, ftp_filemethod, -1);
 }
 
@@ -2122,7 +2122,7 @@ static VALUE ruby_curl_easy_on_debug_set(int argc, VALUE *argv, VALUE self) {
 /***********************************************
  * This is an rb_iterate callback used to set up http headers.
  */
-static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
+static VALUE cb_each_http_header(VALUE header, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE header_str = Qnil;
 
@@ -2157,7 +2157,7 @@ static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
 /***********************************************
  * This is an rb_iterate callback used to set up http proxy headers.
  */
-static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap) {
+static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE proxy_header_str = Qnil;
 
@@ -2189,7 +2189,7 @@ static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap) {
 /***********************************************
  * This is an rb_iterate callback used to set up ftp commands.
  */
-static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
+static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE ftp_command_string;
   Data_Get_Struct(wrap, struct curl_slist *, list);
@@ -2203,7 +2203,7 @@ static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
 /***********************************************
  * This is an rb_iterate callback used to set up the resolve list.
  */
-static VALUE cb_each_resolve(VALUE resolve, VALUE wrap) {
+static VALUE cb_each_resolve(VALUE resolve, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE resolve_string;
   Data_Get_Struct(wrap, struct curl_slist *, list);
@@ -2602,7 +2602,7 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
   }
 
   // set values on cleanup to nil
-  rb_easy_del("multi");
+  //rb_easy_del("multi");
 
   return Qnil;
 }

data/ext/curb_macros.h

@@ -156,10 +156,16 @@
 #define CURB_DEFINE(name) \
   rb_define_const(mCurl, #name, LONG2NUM(name))
 
-#define CURB_RB_CALLBACK_RAISE(context) \
-  VALUE exception = rb_errinfo(); \
-  const char *msg = rb_respond_to(exception,rb_intern("message")) ? RSTRING_PTR(rb_funcall(exception, rb_intern("message"), 0)) : ""; \
-  rb_set_errinfo(Qnil); \
-  rb_raise(eCurlErrAbortedByCallback, "Operation was aborted by an application callback[%s]:\"%s\"", context, msg);
+/* copy and raise exception */
+#define CURB_CHECK_RB_CALLBACK_RAISE(did_raise) \
+  VALUE exception = rb_hash_aref(did_raise, rb_easy_hkey("error")); \
+  if (FIX2INT(rb_hash_size(did_raise)) > 0 && exception != Qnil) { \
+    rb_hash_clear(did_raise); \
+    VALUE message   = rb_funcall(exception, rb_intern("message"), 0); \
+    VALUE aborted_exception = rb_exc_new_str(eCurlErrAbortedByCallback, message); \
+    VALUE backtrace = rb_funcall(exception, rb_intern("backtrace"), 0); \
+    rb_funcall(aborted_exception,  rb_intern("set_backtrace"), 1, backtrace); \
+    rb_exc_raise(aborted_exception); \
+  }
 
 #endif

data/ext/curb_multi.c

@@ -43,6 +43,27 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy);
 static void rb_curl_multi_read_info(VALUE self, CURLM *mptr);
 static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_running);
 
+static VALUE callback_exception(VALUE did_raise, VALUE exception) {
+  // TODO: we could have an option to enable exception reporting
+/*  VALUE ret = rb_funcall(exception, rb_intern("message"), 0);
+  VALUE trace = rb_funcall(exception, rb_intern("backtrace"), 0);
+  if (RB_TYPE_P(trace, T_ARRAY) && RARRAY_LEN(trace) > 0) {
+    printf("we got an exception: %s:%d\n", StringValueCStr(ret), RARRAY_LEN(trace));
+    VALUE sep = rb_str_new_cstr("\n");
+    VALUE trace_lines = rb_ary_join(trace, sep);
+    if (RB_TYPE_P(trace_lines, T_STRING)) {
+      printf("%s\n", StringValueCStr(trace_lines));
+    } else {
+      printf("trace is not a string??\n");
+    }
+  } else {
+    printf("we got an exception: %s\nno stack available\n", StringValueCStr(ret));
+  }
+  */
+  rb_hash_aset(did_raise, rb_easy_hkey("error"), exception);
+  return exception;
+}
+
 void curl_multi_free(ruby_curl_multi *rbcm) {
   curl_multi_cleanup(rbcm->handle);
   free(rbcm);
@@ -291,16 +312,14 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
     raise_curl_easy_error_exception(ecode);
   }
 
-  int status;
+  VALUE did_raise = rb_hash_new();
 
   if (!rb_easy_nil("complete_proc")) {
     callargs = rb_ary_new3(2, rb_easy_get("complete_proc"), easy);
     rbce->callback_active = 1;
-    rb_protect(call_status_handler1, callargs, &status);
+    rb_rescue(call_status_handler1, callargs, callback_exception, did_raise);
     rbce->callback_active = 0;
-    if (status) {
-      CURB_RB_CALLBACK_RAISE("complete")
-    }
+    CURB_CHECK_RB_CALLBACK_RAISE(did_raise);
   }
 
 #ifdef HAVE_CURLINFO_RESPONSE_CODE
@@ -316,48 +335,39 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
     if (!rb_easy_nil("failure_proc")) {
       callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
       rbce->callback_active = 1;
-      rb_protect(call_status_handler2, callargs, &status);
+      rb_rescue(call_status_handler2, callargs, callback_exception, did_raise);
       rbce->callback_active = 0;
-      if (status) {
-        CURB_RB_CALLBACK_RAISE("failure")
-      }
+      CURB_CHECK_RB_CALLBACK_RAISE(did_raise);
     }
   } else if (!rb_easy_nil("success_proc") &&
           ((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);
     rbce->callback_active = 1;
-    rb_protect(call_status_handler1, callargs, &status);
+    rb_rescue(call_status_handler1, callargs, callback_exception, did_raise);
     rbce->callback_active = 0;
-    if (status) {
-      CURB_RB_CALLBACK_RAISE("success")
-    }
+    CURB_CHECK_RB_CALLBACK_RAISE(did_raise);
+
   } else if (!rb_easy_nil("redirect_proc") && ((response_code >= 300 && response_code < 400) || redirect_count > 0) ) {
     rbce->callback_active = 1;
     callargs = rb_ary_new3(3, rb_easy_get("redirect_proc"), easy, rb_curl_easy_error(result));
     rbce->callback_active = 0;
-    rb_protect(call_status_handler2, callargs, &status);
-    if (status) {
-      CURB_RB_CALLBACK_RAISE("redirect")
-    }
+    rb_rescue(call_status_handler2, callargs, callback_exception, did_raise);
+    CURB_CHECK_RB_CALLBACK_RAISE(did_raise);
   } else if (!rb_easy_nil("missing_proc") &&
           (response_code >= 400 && response_code < 500)) {
     rbce->callback_active = 1;
     callargs = rb_ary_new3(3, rb_easy_get("missing_proc"), easy, rb_curl_easy_error(result));
     rbce->callback_active = 0;
-    rb_protect(call_status_handler2, callargs, &status);
-    if (status) {
-      CURB_RB_CALLBACK_RAISE("missing")
-    }
+    rb_rescue(call_status_handler2, callargs, callback_exception, did_raise);
+    CURB_CHECK_RB_CALLBACK_RAISE(did_raise);
   } else if (!rb_easy_nil("failure_proc") &&
           (response_code >= 500 && response_code <= 999)) {
     callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
     rbce->callback_active = 1;
-    rb_protect(call_status_handler2, callargs, &status);
+    rb_rescue(call_status_handler2, callargs, callback_exception, did_raise);
     rbce->callback_active = 0;
-    if (status) {
-      CURB_RB_CALLBACK_RAISE("failure")
-    }
+    CURB_CHECK_RB_CALLBACK_RAISE(did_raise);
   }
 
 }

data/lib/curl/multi.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 module Curl
   class Multi
+    class DownloadError < RuntimeError
+      attr_accessor :errors
+    end
     class << self
       # call-seq:
       #   Curl::Multi.get(['url1','url2','url3','url4','url5'], :follow_location => true) do|easy|
@@ -241,7 +244,11 @@ module Curl
             errors << e
           end
         }
-        raise errors unless errors.empty?
+        if errors.any?
+          de = Curl::Multi::DownloadError.new
+          de.errors = errors
+          raise de
+        end
       end
     end
 

data/tests/bug_crash_on_debug.rb

@@ -1,30 +1,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
-
-require 'curl'
-
 class BugCrashOnDebug < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
 
   def test_on_debug
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
-    puts 'a'
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
-    puts 'b'
-    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/test")
     did_raise = false
     did_call = false
     begin
       c.on_success do|x|
-        puts x.inspect
         did_call = true
         raise "error" # this will get swallowed
       end
@@ -32,16 +16,8 @@ class BugCrashOnDebug < Test::Unit::TestCase
     rescue => e
       did_raise = true
     end
-    puts c.response_code
     assert did_raise
     assert did_call
-    puts 'c'
-  ensure
-    puts 'd'
-    server.shutdown
-    puts 'e'
-    puts thread.exit
-    puts 'f'
   end
 
 end

data/tests/bug_crash_on_progress.rb

@@ -1,22 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugCrashOnDebug < Test::Unit::TestCase
-  
-  def test_on_progress_raise
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
+  include BugTestServerSetupTeardown
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
-
-    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+  def test_on_progress_raise
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/test")
     c.on_progress do|x|
       raise "error"
     end
@@ -27,22 +15,9 @@ class BugCrashOnDebug < Test::Unit::TestCase
   rescue => e
     assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
     c.close
-  ensure
-    server&.shutdown
-    thread&.exit
   end
 
   def test_on_progress_abort
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
-
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
-
     # see: https://github.com/taf2/curb/issues/192,
     # to pass:
     # 
@@ -55,21 +30,20 @@ class BugCrashOnDebug < Test::Unit::TestCase
     # 
     #  notice no return keyword
     #
-    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c = Curl::Easy.new("http://127.0.0.1:#{@port}/test")
+    did_progress = false
     c.on_progress do|x|
-      puts "we're in the progress callback"
+      did_progress = true
       return false
     end
     c.perform
+    assert did_progress
 
     assert false, "should not reach this point"
 
   rescue => e
     assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
     c.close
-  ensure
-    server&.shutdown
-    thread&.exit
   end
 
 end

data/tests/bug_curb_easy_blocks_ruby_threads.rb

@@ -1,21 +1,19 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
-  def test_bug
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = 9999
+    @response_proc = lambda do|res|
       sleep 0.5
       res.body = "hi"
       res['Content-Type'] = "text/html"
     end
+    super
+  end
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
-
+  def test_bug
     threads = []
     timer = Time.now
 
@@ -45,8 +43,5 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
     puts "requested in #{single_time}"
 
     assert single_time > multi_time
-
-    server.shutdown
-    thread.join
   end
 end

data/tests/bug_curb_easy_post_with_string_no_content_length_header.rb

@@ -22,26 +22,15 @@ end
 Any insight you care to share would be helpful. Thanks.
 =end
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
-  def test_bug_workaround
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      assert_equal '15', req['Content-Length']
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
+  include BugTestServerSetupTeardown
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
+  def test_bug_workaround
     params = {:cat => "hat", :foo => "bar"}
 
     post_body = params.map{|f,k| "#{Curl::Easy.new.escape(f)}=#{Curl::Easy.new.escape(k)}"}.join('&')
-    c = Curl::Easy.http_post("http://127.0.0.1:9999/test",post_body) do |curl|
+    c = Curl::Easy.http_post("http://127.0.0.1:#{@port}/test",post_body) do |curl|
       curl.headers["User-Agent"] = "Curl/Ruby"
       curl.headers["X-Tender-Auth"] = "A Token"
       curl.headers["Accept"] = "application/vnd.tender-v1+json"
@@ -50,23 +39,12 @@ class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
       curl.enable_cookies = true
     end
 
-    server.shutdown
-    thread.join
   end
-  def test_bug
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      assert_equal '15', req['Content-Length']
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
+  def test_bug
     params = {:cat => "hat", :foo => "bar"}
 
-    c = Curl::Easy.http_post("http://127.0.0.1:9999/test") do |curl|
+    c = Curl::Easy.http_post("http://127.0.0.1:#{@port}/test") do |curl|
       curl.headers["User-Agent"] = "Curl/Ruby"
       curl.headers["X-Tender-Auth"] = "A Token"
       curl.headers["Accept"] = "application/vnd.tender-v1+json"
@@ -76,8 +54,6 @@ class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
       curl.follow_location = true
       curl.enable_cookies = true
     end
-
-    server.shutdown
-    thread.join
   end
+
 end

data/tests/bug_follow_redirect_288.rb

@@ -1,22 +1,17 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugFollowRedirect288 < Test::Unit::TestCase
-  def test_follow_redirect_with_no_redirect
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
-    server.mount_proc("/redirect_to_test") do|req,res|
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = 9999
+    super
+    @server.mount_proc("/redirect_to_test") do|req,res|
       res.set_redirect(WEBrick::HTTPStatus::TemporaryRedirect, "/test")
     end
+  end
 
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
+  def test_follow_redirect_with_no_redirect
 
     c = Curl::Easy.new('http://127.0.0.1:9999/test')
     did_call_redirect = false
@@ -67,6 +62,7 @@ class BugFollowRedirect288 < Test::Unit::TestCase
     assert_equal 0, c.redirect_count
     assert_equal 200, c.response_code
 
+    puts "checking for raise support"
     did_raise = false
     begin
       c = Curl::Easy.new('http://127.0.0.1:9999/redirect_to_test')
@@ -79,12 +75,8 @@ class BugFollowRedirect288 < Test::Unit::TestCase
     rescue => e
       did_raise = true
     end
-    assert did_raise
     assert_equal 307, c.response_code
-
-  ensure
-    server.stop
-    thread.join
+    assert did_raise
 
   end
 

data/tests/bug_instance_post_differs_from_class_post.rb

@@ -35,15 +35,13 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
   end
 
   def do_test
-    c = Curl::Easy.http_post('https://www.google.com/accounts/ServiceLoginAuth',
-                Curl::PostField.content('ltmpl','m_blanco'))
+    c = Curl::Easy.http_post('https://www.google.com/accounts/ServiceLoginAuth', Curl::PostField.content('ltmpl','m_blanco'))
     body_c, header_c = c.body_str, c.header_str
    
     sleep 2
 
-    c.http_post('https://www.google.com/accounts/ServiceLoginAuth',
-                Curl::PostField.content('ltmpl','m_blanco'))
-    body_i, header_i = c.body_str, c.header_str
+    c.http_post('https://www.google.com/accounts/ServiceLoginAuth', Curl::PostField.content('ltmpl','m_blanco'))
+    body_i, header_i = c.body, c.head
 
     # timestamps will differ, just check first bit. We wont get here if
     # the bug bites anyway...

data/tests/bug_multi_segfault.rb

@@ -3,6 +3,7 @@
 # irb: multi = Curl::Multi.new
 # irb: exit
 # <main>:47140: [BUG] Bus Error
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','ext'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 require 'curb'

data/tests/bug_raise_on_callback.rb

@@ -1,22 +1,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
-
-require 'curl'
-
 class BugRaiseOnCallback < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = 9999
+    super
+  end
 
   def test_on_complte
-    server = WEBrick::HTTPServer.new( :Port => 9999 )
-    server.mount_proc("/test") do|req,res|
-      res.body = "hi"
-      res['Content-Type'] = "text/html"
-    end
-    thread = Thread.new(server) do|srv|
-      srv.start
-    end
     c = Curl::Easy.new('http://127.0.0.1:9999/test')
     did_raise = false
     begin
@@ -30,9 +22,6 @@ class BugRaiseOnCallback < Test::Unit::TestCase
     end
     assert did_raise, "we want to raise an exception if the ruby callbacks raise"
 
-  ensure
-    server.shutdown
-    thread.exit
   end
 
 end

data/tests/helper.rb

@@ -135,6 +135,32 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
 
 end
 
+module BugTestServerSetupTeardown
+  def setup
+    @port ||= 9992
+    @server = WEBrick::HTTPServer.new( :Port => @port )
+    @server.mount_proc("/test") do|req,res|
+      if @response_proc
+        @response_proc.call(res)
+      else
+        res.body = "hi"
+        res['Content-Type'] = "text/html"
+      end
+    end
+
+    @thread = Thread.new(@server) do|srv|
+      srv.start
+    end
+  end
+
+  def teardown
+    while @server.status != :Shutdown
+      @server.shutdown
+    end
+    @thread.join
+  end
+end
+
 module TestServerMethods
   def locked_file
     File.join(File.dirname(__FILE__),"server_lock-#{@__port}")

data/tests/tc_curl_easy.rb

@@ -722,7 +722,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl.on_success {|c|
       on_success_called = true
       assert_not_nil c.body
-      assert_match /Content-Length: 7714/, c.head
+      assert_match(/Content-Length: /, c.head)
       assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
     }
     curl.perform

data/tests/tc_curl_multi.rb

@@ -161,6 +161,44 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
   end
 
+  def test_multi_easy_get
+    n = 1
+    urls = []
+    n.times { urls << $TEST_URL }
+    Curl::Multi.get(urls, {timeout: 5}) {|easy|
+      assert_match(/file:/, easy.last_effective_url)
+    }
+  end
+
+  def test_multi_easy_get_with_error
+    begin
+      did_raise = false
+      n = 3
+      urls = []
+      n.times { urls << $TEST_URL }
+      error_line_number_should_be = nil
+      Curl::Multi.get(urls, {timeout: 5}) {|easy|
+        # if we got this right the error will be reported to be on the line below our error_line_number_should_be
+        error_line_number_should_be = __LINE__
+        raise 
+      }
+
+    rescue Curl::Err::AbortedByCallbackError => e
+      did_raise = true
+      in_file = e.backtrace.detect {|err| err.match?(File.basename(__FILE__)) }
+      in_file_stack = e.backtrace.select {|err| err.match?(File.basename(__FILE__)) }
+      assert_match(__FILE__, in_file)
+      in_file.gsub!(__FILE__)
+      parts = in_file.split(':')
+      parts.shift
+      line_no = parts.shift.to_i
+      assert_equal error_line_number_should_be+1, line_no.to_i
+    end
+
+    assert did_raise, "we should have raised an exception"
+
+  end
+
   # NOTE: if this test runs slowly on Mac OSX, it is probably due to the use of a port install curl+ssl+ares install
   # on my MacBook, this causes curl_easy_init to take nearly 0.01 seconds / * 100 below is 1 second too many!
   def test_n_requests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Ross Bamford
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 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