curb 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0105bb19d8f3c70c7b16dc47ede5eef29b26d78a765b6ab9ac19c81dc34c647a
-  data.tar.gz: 8bb7441583b1caa916969f4a7aad3785777de7912347f6c454bb110c4ab50b08
+  metadata.gz: 25a6615cec70148cb19373a5ad0326a93b2e1b4424bd2d02734038857e261659
+  data.tar.gz: 85f2b05e3fd7e8b400d8cd86d65aa2778e4c60e55337442e34d6cda673278c55
 SHA512:
-  metadata.gz: b9d63ab6203a5d37fe3ef02b081f92afa9ece68acdde249d6f3e09fd21fec5fd1342fa6e2fcbfb6fc58a6fd5ad2fce44fd0915d0b0bd31902cc9c5aef976d250
-  data.tar.gz: cb9f110ebeddb88eddc31d9cf1985148365c6abe5a378e2ea157414dd7bc96c59b2b2883ba0b21ac1569d82ee4bc8744cfbeaae1eaae07245c81a146bae78510
+  metadata.gz: de609adca7bcd45c867a8fa91a20caa429e0064c68587d498bf25f455a1d4c49c6d00ec851af7c80aa1cc2694b4d0dd19291ebfb9b3010793dd8fa8c28e22d4c
+  data.tar.gz: af3d577715760e6b6ca977c5a6295d0af5d8b60858d673675d778deff7b06120876b72975ea35062c5299ac45fbab2d45a70b375cf94d07b410eb8c649a443d1

data/{README.markdown → README.md}

@@ -10,6 +10,8 @@ cURL and libcurl live at [https://curl.se/libcurl/](https://curl.se/libcurl/) .
 
 Curb is a work-in-progress, and currently only supports libcurl's `easy` and `multi` modes.
 
+A big advantage to Curb over all other known ruby http libraries is it's ability to handle timeouts without the use of threads.
+
 ## License
 
 Curb is copyright (c) 2006 Ross Bamford, and released under the terms of the

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.9"
-#define CURB_VER_NUM   1009
+#define CURB_VERSION   "1.1.0"
+#define CURB_VER_NUM   1010
 #define CURB_VER_MAJ   1
-#define CURB_VER_MIN   0
-#define CURB_VER_MIC   9
+#define CURB_VER_MIN   1
+#define CURB_VER_MIC   0
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -3821,6 +3821,27 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   case CURLOPT_PROXY_SSL_VERIFYHOST:
     curl_easy_setopt(rbce->curl, CURLOPT_PROXY_SSL_VERIFYHOST, NUM2LONG(val));
     break;
+#endif
+#if HAVE_CURLOPT_RESOLVE
+  case CURLOPT_RESOLVE: {
+    struct curl_slist *list = NULL;
+    if (NIL_P(val)) {
+      /* When nil is passed, we clear any previous resolve list */
+      list = NULL;
+    } else if (TYPE(val) == T_ARRAY) {
+      long i, len = RARRAY_LEN(val);
+      for (i = 0; i < len; i++) {
+        VALUE item = rb_ary_entry(val, i);
+        list = curl_slist_append(list, StringValueCStr(item));
+      }
+    } else {
+      /* If a single string is passed, use it directly */
+      list = curl_slist_append(NULL, StringValueCStr(val));
+    }
+    /* Save the list pointer in the ruby_curl_easy structure for cleanup later */
+    rbce->curl_resolve = list;
+    curl_easy_setopt(rbce->curl, CURLOPT_RESOLVE, list);
+  } break;
 #endif
   default:
     rb_raise(rb_eTypeError, "Curb unsupported option");

data/ext/curb_multi.c

@@ -187,6 +187,25 @@ static VALUE ruby_curl_multi_max_connects(VALUE self, VALUE count) {
   return count;
 }
 
+/*
+ * call-seq:
+ * multi = Curl::Multi.new
+ * multi.max_host_connections = 1
+ *
+ * Set the max number of connections per host
+ */
+static VALUE ruby_curl_multi_max_host_connections(VALUE self, VALUE count) {
+#ifdef HAVE_CURLMOPT_MAX_HOST_CONNECTIONS
+  ruby_curl_multi *rbcm;
+
+  Data_Get_Struct(self, ruby_curl_multi, rbcm);
+
+  curl_multi_setopt(rbcm->handle, CURLMOPT_MAX_HOST_CONNECTIONS, NUM2LONG(count));
+#endif
+
+  return count;
+}
+
 /*
  * call-seq:
  * multi = Curl::Multi.new
@@ -704,6 +723,7 @@ void init_curb_multi() {
   rb_define_singleton_method(cCurlMulti, "autoclose", ruby_curl_multi_get_autoclose, 0);
   /* Instance methods */
   rb_define_method(cCurlMulti, "max_connects=", ruby_curl_multi_max_connects, 1);
+  rb_define_method(cCurlMulti, "max_host_connections=", ruby_curl_multi_max_host_connections, 1);
   rb_define_method(cCurlMulti, "pipeline=", ruby_curl_multi_pipeline, 1);
   rb_define_method(cCurlMulti, "_add", ruby_curl_multi_add, 1);
   rb_define_method(cCurlMulti, "_remove", ruby_curl_multi_remove, 1);

data/ext/extconf.rb

@@ -338,6 +338,9 @@ have_constant :CURL_SSLVERSION_TLSv1
 have_constant :CURL_SSLVERSION_SSLv2
 have_constant :CURL_SSLVERSION_SSLv3
 
+# Added in 7.30.0
+have_constant "curlmopt_max_host_connections"
+
 # Added in 7.34.0
 have_constant :CURL_SSLVERSION_TLSv1_0
 have_constant :CURL_SSLVERSION_TLSv1_1

data/lib/curl.rb

@@ -3,7 +3,6 @@ require 'curb_core'
 require 'curl/easy'
 require 'curl/multi'
 require 'uri'
-require 'cgi'
 
 # expose shortcut methods
 module Curl

data/tests/bug_resolve.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugResolve < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  def test_abuse_resolve
+    c = Curl::Easy.new("http://localhost:#{@port}/test")
+    while true
+      c.get
+      assert_equal 200, c.response_code
+      assert_match(/hi/, c.body)
+    end
+  end
+
+end

data/tests/helper.rb

@@ -3,6 +3,7 @@
 $CURB_TESTING = true
 require 'uri'
 require 'stringio'
+require 'digest/md5'
 
 $TOPDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 $EXTDIR = File.join($TOPDIR, 'ext')

data/tests/tc_curl_easy.rb

@@ -18,6 +18,20 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 200, easy.code
   end
 
+  def test_curlopt_resolve
+    require 'resolv'
+    uri = URI.parse(TestServlet.url)
+    resolved_ip = Resolv.getaddress(uri.host)   # perform DNS lookup once
+    mapping = "#{uri.host}:#{uri.port}:#{resolved_ip}"
+
+    http = Curl::Easy.new(TestServlet.url)
+    http.setopt(Curl::CURLOPT_RESOLVE, [mapping])
+
+    http.get
+
+    assert_match(/GET/, http.body)
+  end
+
   def test_curlopt_stderr_with_file
     # does not work with Tempfile directly
     path = Tempfile.new('curb_test_curlopt_stderr').path
@@ -805,8 +819,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new(TestServlet.url)
     curl.multipart_form_post = true
     fields = [
-      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))),
-      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
+      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README.md'))),
+      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README.md')))
     ]
     curl.http_post(fields)
     assert_match(/HTTP POST file upload/, curl.body_str)
@@ -815,8 +829,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new(TestServlet.url)
     curl.multipart_form_post = true
     fields = [
-      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))),
-      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
+      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README.md'))),
+      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README.md')))
     ]
     curl.http_put(fields)
     assert_match(/HTTP POST file upload/, curl.body_str)
@@ -866,7 +880,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     [:put, :post, :patch].each {|method|
       curl = Curl::Easy.new(TestServlet.url)
       curl.multipart_form_post = true
-      pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
+      pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README.md')))
       curl.send("http_#{method}", pf)
       assert_match(/HTTP POST file upload/, curl.body_str)
       assert_match(/Content-Disposition: form-data/, curl.body_str)
@@ -1048,7 +1062,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_post_streaming
-    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))
+    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README.md'))
     
     pf = Curl::PostField.file("filename", readme)
 
@@ -1058,11 +1072,10 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     easy.multipart_form_post = true
     easy.http_post(pf)
 
-    assert_not_equal(0,easy.body_str.size)
-    assert_equal(easy.body_str.tr("\r", ''), File.read(readme))
+    assert_not_equal(0,easy.body.size)
+    assert_equal(Digest::MD5.hexdigest(easy.body), Digest::MD5.hexdigest(File.read(readme)))
   end
 
-
   def test_easy_close
     easy = Curl::Easy.new
     easy.close

data/tests/tc_curl_multi.rb

@@ -552,6 +552,25 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
+  def test_multi_easy_http_with_max_host_connections
+    urls = [
+      { :url => TestServlet.url + '?q=1', :method => :get },
+      { :url => TestServlet.url + '?q=2', :method => :get },
+      { :url => TestServlet.url + '?q=3', :method => :get }
+    ]
+    Curl::Multi.http(urls, {:pipeline => true, :max_host_connections => 1}) do|easy, code, method|
+      assert_equal 200, code
+      case method
+      when :post
+        assert_match(/POST/, easy.body)
+      when :get
+        assert_match(/GET/, easy.body)
+      when :put
+        assert_match(/PUT/, easy.body)
+      end
+    end
+  end
+
   def test_multi_recieves_500
     m = Curl::Multi.new
     e = Curl::Easy.new("http://127.0.0.1:9129/methods")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
 bindir: bin
 cert_chain: []
-date: 2025-02-15 00:00:00.000000000 Z
+date: 2025-07-24 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
@@ -19,10 +19,10 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files:
 - LICENSE
-- README.markdown
+- README.md
 files:
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - doc.rb
 - ext/banned.h
@@ -58,6 +58,7 @@ files:
 - tests/bug_postfields_crash2.rb
 - tests/bug_raise_on_callback.rb
 - tests/bug_require_last_or_segfault.rb
+- tests/bug_resolve.rb
 - tests/bugtests.rb
 - tests/helper.rb
 - tests/mem_check.rb
@@ -83,7 +84,7 @@ metadata:
   changelog_uri: https://github.com/taf2/curb/blob/master/ChangeLog.md
 rdoc_options:
 - "--main"
-- README.markdown
+- README.md
 require_paths:
 - lib
 - ext
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
@@ -116,6 +117,7 @@ test_files:
 - tests/bug_postfields_crash2.rb
 - tests/bug_raise_on_callback.rb
 - tests/bug_require_last_or_segfault.rb
+- tests/bug_resolve.rb
 - tests/bugtests.rb
 - tests/helper.rb
 - tests/mem_check.rb