curb 0.8.2 → 0.8.3

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.8.2"
-#define CURB_VER_NUM   802
+#define CURB_VERSION   "0.8.3"
+#define CURB_VER_NUM   803
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   8
-#define CURB_VER_MIC   2
+#define CURB_VER_MIC   3
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_multi.c

@@ -589,8 +589,10 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
       switch(rc) {
       case -1:
-        rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
-        break;
+        if(errno != EINTR) {
+          rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
+          break;
+        }
       case 0: /* timeout */
       default: /* action */
         rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );

data/lib/curl.rb

@@ -45,13 +45,15 @@ module Curl
     query_str = params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
     if url.match(/\?/)
       "#{url}&#{query_str}"
-    else
+    elsif query_str.size > 0
       "#{url}?#{query_str}"
+    else
+      url
     end
   end
 
   def self.postalize(params={})
-    params.is_a?(String) ? params : params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
+    params.respond_to?(:map) ? URI.encode_www_form(params) : (params.respond_to?(:to_s) ? params.to_s : params)
   end
 
 end

data/tests/bug_crash_on_debug.rb

@@ -19,7 +19,7 @@ class BugCrashOnDebug < Test::Unit::TestCase
       srv.start
     end
     puts 'b'
-    c = Curl::Easy.new('http://localhost:9999/test')
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
     c.on_debug do|x|
       puts x.inspect
       raise "error" # this will get swallowed

data/tests/bug_crash_on_progress.rb

@@ -16,7 +16,7 @@ class BugCrashOnDebug < Test::Unit::TestCase
       srv.start
     end
 
-    c = Curl::Easy.new('http://localhost:9999/test')
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
     c.on_progress do|x|
       raise "error"
     end

data/tests/bug_curb_easy_blocks_ruby_threads.rb

@@ -21,7 +21,7 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
 
     5.times do |i|
       t = Thread.new do
-        c = Curl::Easy.perform('http://localhost:9999/test')
+        c = Curl::Easy.perform('http://127.0.0.1:9999/test')
         c.header_str
       end
       threads << t
@@ -37,7 +37,7 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
     timer = Time.now
     single_responses = []
     5.times do |i|
-      c = Curl::Easy.perform('http://localhost:9999/test')
+      c = Curl::Easy.perform('http://127.0.0.1:9999/test')
       single_responses << c.header_str
     end
     

data/tests/signals.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+# This test suite requires the timeout server to be running
+# See tests/timeout.rb for more info about the timeout server
+class TestCurbSignals < Test::Unit::TestCase
+
+  # Testcase for https://github.com/taf2/curb/issues/117
+  def test_continue_after_signal
+    trap("SIGUSR1") { }
+
+    curl = Curl::Easy.new(wait_url(2))
+    pid = $$
+    Thread.new do
+      sleep 1
+      Process.kill("SIGUSR1", pid)
+    end
+    assert_equal true, curl.http_get
+  end
+
+  private
+  
+  def wait_url(time)
+    "#{server_base}/wait/#{time}"
+  end
+  
+  def serve_url(chunk_size, time, count)
+    "#{server_base}/serve/#{chunk_size}/every/#{time}/for/#{count}"
+  end
+  
+  def server_base
+    'http://127.0.0.1:9128'
+  end
+end

data/tests/tc_curl_download.rb

@@ -8,7 +8,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
   
   def test_download_url_to_file_via_string
-    dl_url = "http://localhost:9129/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
@@ -19,7 +19,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_url_to_file_via_file_io
-    dl_url = "http://localhost:9129/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     io = File.open(dl_path, 'wb')
 
@@ -32,7 +32,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_url_to_file_via_io
-    dl_url = "http://localhost:9129/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     reader, writer = IO.pipe
 
@@ -62,7 +62,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_bad_url_gives_404
-    dl_url = "http://localhost:9129/this_file_does_not_exist.html"
+    dl_url = "http://127.0.0.1:9129/this_file_does_not_exist.html"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-09 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
@@ -61,6 +61,7 @@ files:
 - tests/helper.rb
 - tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/signals.rb
 - tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
@@ -114,6 +115,7 @@ test_files:
 - tests/helper.rb
 - tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/signals.rb
 - tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb