curb 0.9.8 → 1.0.5

data/tests/bug_follow_redirect_288.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugFollowRedirect288 < Test::Unit::TestCase
+  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
+
+  def test_follow_redirect_with_no_redirect
+
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    did_call_redirect = false
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.perform
+
+    assert !did_call_redirect, "should reach this point redirect should not have been called"
+
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    did_call_redirect = false
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.follow_location = true
+    c.perform
+
+    assert_equal 0, c.redirect_count
+    assert !did_call_redirect, "should reach this point redirect should not have been called"
+
+    c = Curl::Easy.new('http://127.0.0.1:9999/redirect_to_test')
+    did_call_redirect = false
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.perform
+    assert_equal 307, c.response_code
+
+    assert did_call_redirect, "we should have called on_redirect"
+
+    c = Curl::Easy.new('http://127.0.0.1:9999/redirect_to_test')
+    did_call_redirect = false
+    c.follow_location = true
+    # NOTE: while this API is not supported by libcurl e.g. there is no redirect function callback in libcurl we could 
+    # add support in ruby for this by executing this callback if redirect_count is greater than 0 at the end of a request in curb_multi.c
+    c.on_redirect do|x|
+      did_call_redirect = true
+    end
+    c.perform
+    assert_equal 1, c.redirect_count
+    assert_equal 200, c.response_code
+
+    assert did_call_redirect, "we should have called on_redirect"
+
+    c.url = 'http://127.0.0.1:9999/test'
+    c.perform
+    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')
+      did_call_redirect = false
+      c.on_redirect do|x|
+        raise "raise"
+        did_call_redirect = true
+      end
+      c.perform
+    rescue => e
+      did_raise = true
+    end
+    assert_equal 307, c.response_code
+    assert did_raise
+
+  end
+
+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_issue277.rb

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

@@ -0,0 +1,29 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugRaiseOnCallback < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  def setup
+    @port = 9999
+    super
+  end
+
+  def test_on_complte
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    did_raise = false
+    begin
+      c.on_complete do|x|
+        assert_equal 'http://127.0.0.1:9999/test', x.url
+        raise "error complete" # this will get swallowed
+      end
+      c.perform
+    rescue => e
+      did_raise = true
+    end
+    assert did_raise, "we want to raise an exception if the ruby callbacks raise"
+
+  end
+
+end
+
+#test_on_debug

data/tests/helper.rb

@@ -2,6 +2,7 @@
 # Copyright (c)2006 Ross Bamford. See LICENSE.
 $CURB_TESTING = true
 require 'uri'
+require 'stringio'
 
 $TOPDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 $EXTDIR = File.join($TOPDIR, 'ext')
@@ -134,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}")
@@ -142,7 +169,6 @@ module TestServerMethods
   def server_setup(port=9129,servlet=TestServlet)
     @__port = port
     if (@server ||= nil).nil? and !File.exist?(locked_file)
-
       File.open(locked_file,'w') {|f| f << 'locked' }
       if TEST_SINGLE_THREADED
         rd, wr = IO.pipe

data/tests/tc_curl_easy.rb

@@ -10,6 +10,74 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     Curl.reset
   end
 
+  def test_nested_easy_methods
+    easy = Curl.get(TestServlet.url) {|http|
+      res = Curl.get(TestServlet.url + '/not_here')
+      assert_equal 404, res.code
+    }
+    assert_equal 200, easy.code
+  end
+
+  def test_curlopt_stderr_with_file
+    # does not work with Tempfile directly
+    path = Tempfile.new('curb_test_curlopt_stderr').path
+    File.open(path, 'w') do |file|
+      easy = Curl::Easy.new(TestServlet.url)
+      easy.verbose = true
+      easy.setopt(Curl::CURLOPT_STDERR, file)
+      easy.perform
+    end
+    output = File.read(path)
+
+    assert_match(/HTTP\/1\.1\ 200\ OK(?:\ )?/, output)
+    assert_match('Host: 127.0.0.1:9129', output)
+  end
+
+  def test_curlopt_stderr_with_io
+    path = Tempfile.new('curb_test_curlopt_stderr').path
+    fd = IO.sysopen(path, 'w')
+    io = IO.for_fd(fd)
+
+    easy = Curl::Easy.new(TestServlet.url)
+    easy.verbose = true
+    easy.setopt(Curl::CURLOPT_STDERR, io)
+    easy.perform
+
+
+    output = File.read(path)
+
+    assert_match(output, 'HTTP/1.1 200 OK')
+    assert_match(output, 'Host: 127.0.0.1:9129')
+  end
+
+  def test_curlopt_stderr_fails_with_tempdir
+    Tempfile.open('curb_test_curlopt_stderr') do |tempfile|
+      easy = Curl::Easy.new(TestServlet.url)
+
+      assert_raise(TypeError) do
+        easy.setopt(Curl::CURLOPT_STDERR, tempfile)
+      end
+    end
+  end
+
+  def test_curlopt_stderr_fails_with_stringio
+    stringio = StringIO.new
+    easy = Curl::Easy.new(TestServlet.url)
+
+    assert_raise(TypeError) do
+      easy.setopt(Curl::CURLOPT_STDERR, stringio)
+    end
+  end
+
+  def test_curlopt_stderr_fails_with_string
+    string = String.new
+    easy = Curl::Easy.new(TestServlet.url)
+
+    assert_raise(TypeError) do
+      easy.setopt(Curl::CURLOPT_STDERR, string)
+    end
+  end
+
   def test_exception
     begin
       Curl.get('NOT_FOUND_URL')
@@ -653,9 +721,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     on_success_called = false
     curl.on_success {|c|
       on_success_called = true
-      assert_not_nil c.body_str
-      assert_equal "", c.header_str
-      assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+      assert_not_nil c.body
+      assert_match(/Content-Length: /, c.head)
+      assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
     }
     curl.perform
     assert on_success_called, "Success handler not called" 
@@ -1079,7 +1147,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     c = Curl::Easy.new($TEST_URL)
     c.on_success {|x| raise "error" }
     c.perform
-  rescue => e
+  rescue Curl::Err::AbortedByCallbackError => e
     assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
     c.close
   end

data/tests/tc_curl_maxfilesize.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurbCurlMaxFileSize < Test::Unit::TestCase
+  def setup
+    @easy = Curl::Easy.new
+  end
+
+  def test_maxfilesize
+    @easy.set(Curl::CURLOPT_MAXFILESIZE, 5000000)
+  end
+
+end

data/tests/tc_curl_multi.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'set'
 
 class TestCurbCurlMulti < Test::Unit::TestCase
   def teardown
@@ -9,19 +10,58 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   # for https://github.com/taf2/curb/issues/277
   # must connect to an external
   def test_connection_keepalive
-    # 0123456 default & reserved RubyVM. It will probably include 7 from Dir.glob
-    open_fds = lambda do 
-      `/usr/sbin/lsof -p #{Process.pid} | egrep "TCP|UDP" | wc -l`.strip.to_i
+    # 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
+    omit("Skip, libcurl too old (< 7.22.0)") if Curl::CURL_VERSION.split('.')[1].to_i <= 22
+
+    @server.shutdown if @server
+    @test_thread.kill if @test_thread
+    @server = nil
+    File.unlink(locked_file)
+    Curl::Multi.autoclose = true
+    assert Curl::Multi.autoclose
+# XXX: thought maybe we can clean house here to have the full suite pass in osx... but for now running this test in isolate does pass
+#      additionally, if ss allows this to pass on linux without requesting google i think this is a good trade off... leaving some of the thoughts below
+#      in hopes that coming back to this later will find it and remember how to fix it
+#    types = Set.new
+#    close_types = Set.new([TCPServer,TCPSocket,Socket,Curl::Multi, Curl::Easy,WEBrick::Log])
+#    ObjectSpace.each_object {|o|
+#      if o.respond_to?(:close)
+#        types << o.class
+#      end
+#      if close_types.include?(o.class)
+#        o.close
+#      end
+#    }
+    #puts "unique types: #{types.to_a.join("\n")}"
+    GC.start # cleanup FDs left over from other tests
+    server_setup
+    GC.start # cleanup FDs left over from other tests
+
+    if `which ss`.strip.size == 0
+      # osx need lsof still :(
+      open_fds = lambda do
+        out = `/usr/sbin/lsof -p #{Process.pid} | egrep "TCP|UDP"`# | egrep ':#{TestServlet.port} ' | egrep ESTABLISHED`# | wc -l`.strip.to_i
+        #puts out.lines.join("\n")
+        out.lines.size
+      end
+    else
+      ss = `which ss`.strip
+      open_fds = lambda do
+        `#{ss} -n4 state established dport = :#{TestServlet.port} | wc -l`.strip.to_i
+      end
     end
+    Curl::Multi.autoclose = false
     before_open = open_fds.call
+    #puts "before_open: #{before_open.inspect}"
     assert !Curl::Multi.autoclose
     multi = Curl::Multi.new
     multi.max_connects = 1 # limit to 1 connection within the multi handle
 
     did_complete = false
     5.times do |n|
-      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
-      easy = Curl::Easy.new("http://google.com/") do |curl|
+      easy = Curl::Easy.new(TestServlet.url) do |curl|
         curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
         curl.on_complete {
           did_complete = true
@@ -33,18 +73,21 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     multi.perform
     assert did_complete
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 1, "with max connections set to 1 at this point the connection to google should still be open"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    # ruby process may keep a connection alive 
+    assert (after_open - before_open) < 3, "with max connections set to 1 at this point the connection to google should still be open"
+    assert (after_open - before_open) > 0, "with max connections set to 1 at this point the connection to google should still be open"
     multi.close
 
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 0, "after closing the multi handle all connections should be closed"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 0, (after_open - before_open), "after closing the multi handle all connections should be closed"
 
     Curl::Multi.autoclose = true
     multi = Curl::Multi.new
     did_complete = false
     5.times do |n|
-      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
-      easy = Curl::Easy.new("http://google.com/") do |curl|
+      easy = Curl::Easy.new(TestServlet.url) do |curl|
         curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
         curl.on_complete {
           did_complete = true
@@ -56,7 +99,8 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     multi.perform
     assert did_complete
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 0, "auto close the connections"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 0, (after_open - before_open), "auto close the connections"
   ensure
     Curl::Multi.autoclose = false # restore default
   end
@@ -117,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
@@ -438,7 +520,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       { :url => TestServlet.url, :method => :get }
     ]
     Curl::Multi.http(urls, {:pipeline => true}) do|easy, code, method|
-      assert_equal nil, code
+      assert_equal 200, code
       case method
       when :post
         assert_match(/POST/, easy.body_str)
@@ -452,20 +534,20 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   end
 
   def test_multi_easy_http_with_max_connects
-        urls = [
+    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_connects => 1}) do|easy, code, method|
-      assert_equal nil, code
+      assert_equal 200, code
       case method
       when :post
-        assert_match(/POST/, easy.body_str)
+        assert_match(/POST/, easy.body)
       when :get
-        assert_match(/GET/, easy.body_str)
+        assert_match(/GET/, easy.body)
       when :put
-        assert_match(/PUT/, easy.body_str)
+        assert_match(/PUT/, easy.body)
       end
     end
   end

data/tests/tc_curl_postfield.rb

@@ -2,63 +2,63 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestCurbCurlPostfield < Test::Unit::TestCase
   def test_private_new
-    assert_raise(NoMethodError) { Curl::PostField.new }  
+    assert_raise(NoMethodError) { Curl::PostField.new }
   end
-  
+
   def test_new_content_01
     pf = Curl::PostField.content('foo', 'bar')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'bar', pf.content
     assert_nil pf.content_type
     assert_nil pf.local_file
-    assert_nil pf.remote_file    
+    assert_nil pf.remote_file
     assert_nil pf.set_content_proc
   end
-    
+
   def test_new_content_02
     pf = Curl::PostField.content('foo', 'bar', 'text/html')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'bar', pf.content
     assert_equal 'text/html', pf.content_type
     assert_nil pf.local_file
     assert_nil pf.remote_file
-    assert_nil pf.set_content_proc    
-  end    
-  
+    assert_nil pf.set_content_proc
+  end
+
   def test_new_content_03
     l = lambda { |field| "never gets run" }
     pf = Curl::PostField.content('foo', &l)
-    
+
     assert_equal 'foo', pf.name
     assert_nil pf.content
     assert_nil pf.content_type
     assert_nil pf.local_file
     assert_nil pf.remote_file
-    
+
     # N.B. This doesn't just get the proc, but also removes it.
     assert_equal l, pf.set_content_proc
-  end    
+  end
 
   def test_new_content_04
     l = lambda { |field| "never gets run" }
     pf = Curl::PostField.content('foo', 'text/html', &l)
-    
+
     assert_equal 'foo', pf.name
     assert_nil pf.content
     assert_equal 'text/html', pf.content_type
     assert_nil pf.local_file
     assert_nil pf.remote_file
-    
+
     # N.B. This doesn't just get the proc, but also removes it.
     assert_equal l, pf.set_content_proc
-  end    
+  end
 
 
   def test_new_file_01
     pf = Curl::PostField.file('foo', 'localname')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'localname', pf.local_file
     assert_equal 'localname', pf.remote_file
@@ -67,44 +67,44 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
     assert_nil pf.content
     assert_nil pf.set_content_proc
   end
-    
+
   def test_new_file_02
     pf = Curl::PostField.file('foo', 'localname', 'remotename')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'localname', pf.local_file
     assert_equal 'remotename', pf.remote_file
     assert_nil pf.content_type
     assert_nil pf.content
     assert_nil pf.set_content_proc
-  end    
-  
+  end
+
   def test_new_file_03
     l = lambda { |field| "never gets run" }
     pf = Curl::PostField.file('foo', 'remotename', &l)
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'remotename', pf.remote_file
     assert_nil pf.local_file
     assert_nil pf.content_type
     assert_nil pf.content
-    
+
     # N.B. This doesn't just get the proc, but also removes it.
     assert_equal l, pf.set_content_proc
-  end    
+  end
 
   def test_new_file_04
     assert_raise(ArgumentError) do
       # no local name, no block
       Curl::PostField.file('foo')
     end
-    
+
     assert_raise(ArgumentError) do
       # no remote name with block
       Curl::PostField.file('foo') { |field| "never runs" }
     end
   end
-  
+
   def test_new_file_05
     # local gets ignored when supplying a block, but remote
     # is still set up properly.
@@ -118,15 +118,15 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
     assert_nil pf.content
 
     assert_equal l, pf.set_content_proc
-  end    
-  
+  end
+
   def test_to_s_01
-    pf = Curl::PostField.content('foo', 'bar')    
+    pf = Curl::PostField.content('foo', 'bar')
     assert_equal "foo=bar", pf.to_s
   end
 
   def test_to_s_02
-    pf = Curl::PostField.content('foo', 'bar ton')    
+    pf = Curl::PostField.content('foo', 'bar ton')
     assert_equal "foo=bar%20ton", pf.to_s
   end