curb 1.1.0 → 1.2.1

data/tests/tc_curl_easy.rb

@@ -48,20 +48,62 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_curlopt_stderr_with_io
-    path = Tempfile.new('curb_test_curlopt_stderr').path
+    tmp = Tempfile.new('curb_test_curlopt_stderr')
+    path = tmp.path
     fd = IO.sysopen(path, 'w')
-    io = IO.for_fd(fd)
+    io = IO.new(fd, 'w')
+    io.sync = true
 
     easy = Curl::Easy.new(TestServlet.url)
     easy.verbose = true
     easy.setopt(Curl::CURLOPT_STDERR, io)
     easy.perform
 
+    io.flush
+    io.close
+    output = File.read(path)
+
+    assert_match(/HTTP\/1\.1\ 200\ OK(?:\ )?/, output)
+    assert_match('Host: 127.0.0.1:9129', output)
+  ensure
+    tmp.close! if defined?(tmp) && tmp
+  end
+
+  def test_curlopt_stderr_gc_safe
+    tmp = Tempfile.new('curb_test_curlopt_stderr_gc')
+    path = tmp.path
+    fd = IO.sysopen(path, 'w')
+    io = IO.new(fd, 'w')
+
+    easy = Curl::Easy.new(TestServlet.url)
+    easy.verbose = true
+    easy.setopt(Curl::CURLOPT_STDERR, io)
+
+    # Drop our Ruby reference and force GC; curb should retain it internally
+    io = nil
+    GC.start
+
+    easy.perform
 
     output = File.read(path)
+    assert_match(/HTTP\/1\.1\ 200\ OK(?:\ )?/, output)
+    assert_match('Host: 127.0.0.1:9129', output)
+  ensure
+    tmp.close! if defined?(tmp) && tmp
+  end
 
-    assert_match(output, 'HTTP/1.1 200 OK')
-    assert_match(output, 'Host: 127.0.0.1:9129')
+  def test_head_request_no_body_and_no_timeout
+    # Ensure a HEAD request completes and does not attempt to read a body
+    # even when the server advertises a Content-Length.
+    easy = nil
+    assert_nothing_raised do
+      easy = Curl.http(:HEAD, TestServlet.url)
+    end
+    assert_not_nil easy
+    # Header string should contain the HTTP status line.
+    assert_match(/HTTP\/1\.1\s\d+\s/, easy.header_str.to_s)
+    # Body should be empty for HEAD requests (libcurl won't call the write callback).
+    assert_equal "", easy.body_str.to_s
   end
 
   def test_curlopt_stderr_fails_with_tempdir
@@ -245,6 +287,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
 
   def test_last_effective_url_01
+    omit('Windows file URL semantics differ') if WINDOWS
     c = Curl::Easy.new($TEST_URL)
     
     assert_equal $TEST_URL, c.url
@@ -1041,7 +1084,11 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     $auth_header = nil
     # curl checks the auth type supported by the server, so we have to create a 
     # new easy handle if we're going to change the auth type...
-
+    if WINDOWS
+      # On Windows, libcurl often uses SSPI for NTLM which yields a different
+      # header value and encoding; skip the NTLM-specific assertion.
+      return
+    end
     curl = Curl::Easy.new(TestServlet.url)
     curl.username = "foo"
     curl.password = "bar"
@@ -1073,7 +1120,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     easy.http_post(pf)
 
     assert_not_equal(0,easy.body.size)
-    assert_equal(Digest::MD5.hexdigest(easy.body), Digest::MD5.hexdigest(File.read(readme)))
+    assert_equal(Digest::MD5.hexdigest(easy.body), Digest::MD5.hexdigest(File.binread(readme)))
   end
 
   def test_easy_close
@@ -1095,6 +1142,18 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     easy.http_get
   end
 
+  def test_last_result_initialization
+    # Test for issue #463 - ensure last_result is properly initialized to 0
+    easy = Curl::Easy.new
+    assert_equal 0, easy.last_result, "last_result should be initialized to 0 for new instance"
+    
+    # Test that reset also sets last_result to 0
+    easy.url = TestServlet.url
+    easy.http_get
+    easy.reset
+    assert_equal 0, easy.last_result, "last_result should be reset to 0 after calling reset"
+  end
+
   def test_easy_use_http_versions
     easy = Curl::Easy.new
     easy.url = TestServlet.url + "?query=foo"

data/tests/tc_curl_multi.rb

@@ -10,6 +10,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   # for https://github.com/taf2/curb/issues/277
   # must connect to an external
   def test_connection_keepalive
+    omit('Not supported on Windows runners') if WINDOWS
     # this test fails with libcurl 7.22.0. I didn't investigate, but it may be related
     # to CURLOPT_MAXCONNECTS bug fixed in 7.30.0:
     # https://github.com/curl/curl/commit/e87e76e2dc108efb1cae87df496416f49c55fca0
@@ -171,6 +172,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   end
 
   def test_multi_easy_get_with_error
+    omit('Path/line parsing differs on Windows') if WINDOWS
     begin
       did_raise = false
       n = 3
@@ -571,6 +573,35 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
+  # Regression test for issue #267 (2015): ensure that when reusing
+  # easy handles with constrained concurrency, the callback receives
+  # the correct URL for each completed request rather than repeating
+  # the first URL.
+  def test_multi_easy_http_urls_unique_across_max_connects
+    urls = [
+      { :url => TestServlet.url + '?q=1', :method => :get },
+      { :url => TestServlet.url + '?q=2', :method => :get },
+      { :url => TestServlet.url + '?q=3', :method => :get }
+    ]
+
+    [1, 2, 3].each do |max|
+      results = []
+      Curl::Multi.http(urls.dup, {:pipeline => true, :max_connects => max}) do |easy, code, method|
+        assert_equal 200, code
+        assert_equal :get, method
+        results << easy.last_effective_url
+      end
+
+      # Ensure we saw one completion per input URL
+      assert_equal urls.size, results.size, "expected #{urls.size} results with max_connects=#{max}"
+
+      # And that each URL completed exactly once (no accidental reuse/mis-reporting)
+      expected_urls = urls.map { |u| u[:url] }
+      assert_equal expected_urls.to_set, results.to_set, "unexpected URLs for max_connects=#{max}: #{results.inspect}"
+      assert_equal expected_urls.size, results.uniq.size, "duplicate URLs seen for max_connects=#{max}: #{results.inspect}"
+    end
+  end
+
   def test_multi_recieves_500
     m = Curl::Multi.new
     e = Curl::Easy.new("http://127.0.0.1:9129/methods")

data/tests/tc_fiber_scheduler.rb

@@ -0,0 +1,190 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+begin
+  require 'async'
+rescue LoadError
+  HAS_ASYNC = false
+else
+  HAS_ASYNC = true
+end
+
+# This test verifies that Curl::Easy#perform cooperates with Ruby's Fiber scheduler
+# by running multiple requests concurrently in a single thread using the Async gem.
+class TestCurbFiberScheduler < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  ITERS = 4
+  MIN_S = 0.25
+  # Each request sleeps 0.25s; two concurrent requests should be ~0.25–0.5s.
+  # Allow some jitter in CI environments.
+  THRESHOLD = ((MIN_S*(ITERS/2.0)) + (MIN_S/2.0)) # add more jitter for slower CI environments
+  SERIAL_TIME_WOULD_BE_ABOUT = MIN_S * ITERS
+
+  def setup
+    @port = 9993
+
+    @response_proc = lambda do |res|
+      res['Content-Type'] = 'text/plain'
+      sleep MIN_S
+      res.body = '200'
+    end
+    super
+  end
+
+  def test_multi_is_scheduler_friendly
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+
+    started = Time.now
+    results = []
+
+
+    async_run do
+      m = Curl::Multi.new
+      ITERS.times.each do
+        c = Curl::Easy.new(url)
+        c.on_complete { results << c.code }
+        m.add(c)
+      end
+      m.perform
+    end
+
+    duration = Time.now - started
+
+    assert duration < THRESHOLD, "Requests did not run concurrently under fiber scheduler (#{duration}s) which exceeds the expected threshold of: #{THRESHOLD} serial time would be about: #{SERIAL_TIME_WOULD_BE_ABOUT}"
+    assert_equal ITERS, results.size
+    assert_equal ITERS.times.map {200}, results
+  end
+
+  def test_easy_perform_is_scheduler_friendly
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+
+    started = Time.now
+    results = []
+
+    async_run do |top|
+      tasks = ITERS.times.map do
+        top.async do
+          #t = Time.now.to_i
+          #puts "starting fiber [#{results.size}] -> #{t}"
+          c = Curl.get(url)
+          #puts "received result: #{results.size} -> #{Time.now.to_f - t.to_f}"
+          results << c.code
+
+        end
+      end
+      tasks.each(&:wait)
+    end
+
+    duration = Time.now - started
+
+    assert duration < THRESHOLD, "Requests did not run concurrently under fiber scheduler (#{duration}s) which exceeds the expected threshold of: #{THRESHOLD} serial time would be about: #{SERIAL_TIME_WOULD_BE_ABOUT}"
+    assert_equal ITERS, results.size
+    assert_equal ITERS.times.map {200}, results
+  end
+
+  def test_multi_perform_yields_block_under_scheduler
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+    yielded = 0
+    results = []
+
+    async_run do
+      m = Curl::Multi.new
+      ITERS.times do
+        c = Curl::Easy.new(url)
+        c.on_complete { results << c.code }
+        m.add(c)
+      end
+      m.perform do
+        yielded += 1
+      end
+    end
+
+    assert_operator yielded, :>=, 1, 'perform did not yield block while waiting under scheduler'
+    assert_equal ITERS, results.size
+    assert_equal ITERS.times.map {200}, results
+  end
+
+  def test_multi_single_request_scheduler_path
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+    result = nil
+
+    async_run do
+      m = Curl::Multi.new
+      c = Curl::Easy.new(url)
+      c.on_complete { result = c.code }
+      m.add(c)
+      m.perform
+    end
+
+    assert_equal 200, result
+  end
+
+  def test_multi_reuse_after_scheduler_perform
+    unless HAS_ASYNC
+      warn 'Skipping fiber scheduler test (Async gem not available)'
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+    results = []
+
+    async_run do
+      m = Curl::Multi.new
+      # First round
+      c1 = Curl::Easy.new(url)
+      c1.on_complete { results << c1.code }
+      m.add(c1)
+      m.perform
+
+      # Second round on same multi
+      c2 = Curl::Easy.new(url)
+      c2.on_complete { results << c2.code }
+      m.add(c2)
+      m.perform
+    end
+
+    assert_equal [200, 200], results
+  end
+
+  private
+  def skip_no_async
+    if WINDOWS
+      warn 'Skipping fiber scheduler tests on Windows'
+      return true
+    end
+    unless HAS_ASYNC
+      warn 'Skipping fiber scheduler test (Async gem not available)'
+      return true
+    end
+    false
+  end
+
+  def async_run(&block)
+    # Prefer newer Async.run to avoid deprecated scheduler.async path.
+    if defined?(Async) && Async.respond_to?(:run)
+      Async.run(&block)
+    else
+      Async(&block)
+    end
+  end
+end
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
+  warn 'Skipping fiber scheduler tests on Ruby < 3.1'
+  return
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2025-09-17 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
@@ -52,13 +52,14 @@ files:
 - tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
-- tests/bug_issue277.rb
+- tests/bug_issue_noproxy.rb
+- tests/bug_issue_post_redirect.rb
+- tests/bug_issue_spnego.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - 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
@@ -74,6 +75,7 @@ files:
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/tc_curl_protocols.rb
+- tests/tc_fiber_scheduler.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
@@ -111,13 +113,14 @@ test_files:
 - tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
-- tests/bug_issue277.rb
+- tests/bug_issue_noproxy.rb
+- tests/bug_issue_post_redirect.rb
+- tests/bug_issue_spnego.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - 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
@@ -133,6 +136,7 @@ test_files:
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/tc_curl_protocols.rb
+- tests/tc_fiber_scheduler.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb

data/tests/bug_issue277.rb

@@ -1,32 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-
-require 'curb'
-
-class BugIssue102 < Test::Unit::TestCase
-
-  def test_gc_closewait
-		100.times do
-			responses = {}
-			requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
-			m = Curl::Multi.new
-			# add a few easy handles
-			requests.each do |url|
-				responses[url] = ""
-				c = Curl::Easy.new(url) do|curl|
-					curl.follow_location = true
-					curl.on_body{|data| responses[url] << data; data.size }
-					curl.on_success {|easy| #puts "success, add more easy handles"
-          }
-				end
-				m.add(c)
-			end
-
-			m.perform do
-				#puts "idling... can do some work here"
-			end
-      GC.start
-		end
-	end
-
-end

data/tests/bug_resolve.rb

@@ -1,15 +0,0 @@
-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