curb 0.5.8.0 → 0.5.9.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.5.8.0"
-#define CURB_VER_NUM   580
+#define CURB_VERSION   "0.5.9.0"
+#define CURB_VER_NUM   590
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   5
-#define CURB_VER_MIC   8
+#define CURB_VER_MIC   9
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_multi.c

@@ -32,7 +32,6 @@ 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_mark_all_easy(VALUE key, VALUE rbeasy, ruby_curl_multi *rbcm) {
-  //printf( "mark easy: 0x%X\n", (long)rbeasy );
   rb_gc_mark(rbeasy);
 }
 
@@ -42,20 +41,14 @@ static void curl_multi_mark(ruby_curl_multi *rbcm) {
 }
 
 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
-  r = rb_hash_delete( rbcm->requests, easy );
-  if( r != easy || r == Qnil ) {
-    rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
-  }
 }
 
 static int
@@ -65,7 +58,6 @@ rb_hash_clear_i(VALUE key, VALUE value, VALUE dummy) {
 
 static void curl_multi_free(ruby_curl_multi *rbcm) {
 
-  //printf("hash entries: %d\n", RHASH(rbcm->requests)->tbl->num_entries );
   if (rbcm && !rbcm->requests == Qnil && rb_type(rbcm->requests) == T_HASH && RHASH_LEN(rbcm->requests) > 0) {
 
     rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );

data/tests/tc_curl_multi.rb

@@ -381,7 +381,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
   def test_remove_exception_is_descriptive
     m = Curl::Multi.new
-    c = Curl::Easy.new("http://blah.com")
+    c = Curl::Easy.new("http://127.9.9.9:999110")
     m.remove(c)
   rescue => e
     assert_equal 'Invalid easy handle', e.message
@@ -393,9 +393,9 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     tries = 2
 
-    c1 = Curl::Easy.new('http://127.9.9.9') do |curl|
+    c1 = Curl::Easy.new('http://127.1.1.1:99911') do |curl|
       curl.on_failure {|c,e|
-        assert_equal [Curl::Err::ConnectionFailedError, "Couldn't connect to server"], e
+        assert_equal [Curl::Err::MalformedURLError, "URL using bad/illegal format or missing URL"], e
         if tries > 0
           tries -= 1
           m.add(c)
@@ -410,6 +410,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       m.perform
     end
     assert_equal 0, tries
+    assert_equal 0, m.requests.size
   end
 
   include TestServerMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.8.0
+  version: 0.5.9.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -29,21 +29,21 @@ files:
 - Rakefile
 - doc.rb
 - ext/extconf.rb
-- lib/curl.rb
 - lib/curb.rb
+- lib/curl.rb
 - ext/curb.c
-- ext/curb_upload.c
-- ext/curb_postfield.c
 - ext/curb_easy.c
-- ext/curb_multi.c
 - ext/curb_errors.c
-- ext/curb_errors.h
-- ext/curb_multi.h
+- 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_macros.h
+- ext/curb_multi.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
-- ext/curb_macros.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -75,15 +75,15 @@ signing_key:
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/bug_require_last_or_segfault.rb
-- tests/helper.rb
-- tests/tc_curl_postfield.rb
+- tests/alltests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
-- tests/alltests.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.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/bug_curb_easy_blocks_ruby_threads.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/unittests.rb