curb 0.8.4 → 0.8.8

data/ext/curb_multi.c

@@ -4,13 +4,17 @@
  *
  */
 #include "curb_config.h"
-#ifdef HAVE_RUBY19_ST_H
-  #include <ruby.h>
+#include <ruby.h>
+#ifdef HAVE_RUBY_ST_H
   #include <ruby/st.h>
 #else
-  #include <ruby.h>
   #include <st.h>
 #endif
+
+#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+  #include <ruby/thread.h>
+#endif
+
 #include "curb_easy.h"
 #include "curb_errors.h"
 #include "curb_postfield.h"
@@ -64,7 +68,7 @@ rb_hash_clear_i(VALUE key, VALUE value, VALUE dummy) {
 
 static void curl_multi_free(ruby_curl_multi *rbcm) {
 
-  if (rbcm && !rbcm->requests == Qnil && rb_type(rbcm->requests) == T_HASH && RHASH_LEN(rbcm->requests) > 0) {
+  if (rbcm && !rbcm->requests == Qnil && rb_type(rbcm->requests) == T_HASH && RHASH_SIZE(rbcm->requests) > 0) {
 
     rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );
 
@@ -262,12 +266,9 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
  */
 VALUE ruby_curl_multi_remove(VALUE self, VALUE easy) {
   ruby_curl_multi *rbcm;
-  ruby_curl_easy *rbce;
 
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
 
-  Data_Get_Struct(easy, ruby_curl_easy, rbce);
-
   rb_curl_multi_remove(rbcm,easy);
 
   return self;
@@ -471,7 +472,7 @@ void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
 }
 #endif
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
 struct _select_set {
   int maxfd;
   fd_set *fdread, *fdwrite, *fdexcep;
@@ -511,7 +512,7 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
   long timeout_milliseconds;
   struct timeval tv = {0, 0};
   VALUE block = Qnil;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
   struct _select_set fdset_args;
 #endif
 
@@ -570,17 +571,24 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
       create_crt_fd(&fdexcep, &crt_fdexcep);
 #endif
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
       fdset_args.maxfd = maxfd+1;
       fdset_args.fdread = &fdread;
       fdset_args.fdwrite = &fdwrite;
       fdset_args.fdexcep = &fdexcep;
       fdset_args.tv = &tv;
+#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+      rc = (int)(VALUE) rb_thread_call_without_gvl((void *(*)(void *))curb_select, &fdset_args, RUBY_UBF_IO, 0);
+#elif HAVE_RB_THREAD_BLOCKING_REGION
       rc = rb_thread_blocking_region(curb_select, &fdset_args, RUBY_UBF_IO, 0);
+#elif HAVE_RB_THREAD_FD_SELECT
+      rc = rb_thread_fd_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
 #else
       rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
 #endif
 
+#endif
+
 #ifdef _WIN32
       cleanup_crt_fd(&fdread, &crt_fdread);
       cleanup_crt_fd(&fdwrite, &crt_fdwrite);

data/ext/extconf.rb

@@ -59,6 +59,7 @@ def have_constant(name)
   end
 end
 
+have_constant "curlinfo_appconnect_time"
 have_constant "curlinfo_redirect_time"
 have_constant "curlinfo_response_code"
 have_constant "curlinfo_filetime"
@@ -79,6 +80,7 @@ have_constant "curl_version_sspi"
 have_constant "curl_version_conv"
 have_constant "curlproxy_http"
 have_constant "curlproxy_socks4"
+have_constant "curlproxy_socks4a"
 have_constant "curlproxy_socks5"
 have_constant "curlauth_basic"
 have_constant "curlauth_digest"
@@ -351,6 +353,13 @@ have_constant "curle_not_built_in"
 
 have_constant "curle_obsolete" # removed in 7.24 ?
 
+# gssapi/spnego delegation related constants
+have_constant "curlopt_gssapi_delegation"
+have_constant "curlgssapi_delegation_policy_flag"
+have_constant "curlgssapi_delegation_flag"
+
+have_constant "CURLM_ADDED_ALREADY"
+
 if try_compile('int main() { return 0; }','-Wall')
   $CFLAGS << ' -Wall'
 end
@@ -366,23 +375,6 @@ def test_for(name, const, src)
     end
   end
 end
-test_for("Ruby 1.9 Hash", "RUBY19_HASH", %{
-  #include <ruby.h>
-  int main() {
-    VALUE hash = rb_hash_new();
-    if( RHASH(hash)->ntbl->num_entries ) {
-      return 0;
-    }
-    return 1;
-  }
-})
-test_for("Ruby 1.9 st.h", "RUBY19_ST_H", %{
-  #include <ruby.h>
-  #include <ruby/st.h>
-  int main() {
-    return 0;
-  }
-})
 
 test_for("curl_easy_escape", "CURL_EASY_ESCAPE", %{
   #include <curl/curl.h>
@@ -394,6 +386,7 @@ test_for("curl_easy_escape", "CURL_EASY_ESCAPE", %{
 })
 
 have_func('rb_thread_blocking_region')
+have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
 
 create_header('curb_config.h')
 create_makefile('curb_core')

data/lib/curl/easy.rb

@@ -3,32 +3,44 @@ module Curl
 
     alias post http_post
     alias put http_put
+    alias body body_str
+    alias head header_str
+
+    class Error < Exception
+      attr_accessor :message, :code
+      def initialize(code, msg)
+        self.message = msg
+        self.code = code
+      end
+    end
 
     #
     # call-seq:
     #   easy.status  => String
     #
     def status
-      parts = self.header_str.split(/\s/)
-      status = []
-      parts.shift
-      while parts.size > 0 && parts.first != ''
-        status << parts.shift
-      end
-      status.join(' ')
+      # Matches the last HTTP Status - following the HTTP protocol specification 'Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF'
+      statuses = self.header_str.scan(/HTTP\/\d\.\d\s(\d+\s.+)\r\n/).map{ |match|  match[0] }
+      statuses.last.strip
     end
 
     #
     # call-seq:
     #   easy.set :sym|Fixnum, value
-    # 
+    #
     # set options on the curl easy handle see http://curl.haxx.se/libcurl/c/curl_easy_setopt.html
     #
     def set(opt,val)
       if opt.is_a?(Symbol)
-        setopt(sym2curl(opt), val)
+        option = sym2curl(opt)
       else
-        setopt(opt.to_i, val)
+        option = opt.to_i
+      end
+
+      begin
+        setopt(option, val)
+      rescue TypeError
+        raise TypeError, "Curb doesn't support setting #{opt} [##{option}] option"
       end
     end
 
@@ -56,8 +68,8 @@ module Curl
       ret = self.multi.perform
 
       if self.last_result != 0 && self.on_failure.nil?
-        error = Curl::Easy.error(self.last_result) 
-        raise error.first
+        error = Curl::Easy.error(self.last_result)
+        raise error.first.new(error.last)
       end
 
       ret
@@ -81,54 +93,54 @@ module Curl
     #   easy.perform
     #
     def delete=(onoff)
-      set :customrequest, onoff ? 'delete' : nil
+      set :customrequest, onoff ? 'DELETE' : nil
       onoff
     end
-    # 
+    #
     # call-seq:
-    # 
+    #
     #  easy = Curl::Easy.new("url")
     #  easy.version = Curl::HTTP_1_1
     #  easy.version = Curl::HTTP_1_0
     #  easy.version = Curl::HTTP_NONE
-    # 
+    #
     def version=(http_version)
       set :http_version, http_version
     end
 
-    # 
+    #
     # call-seq:
     #   easy.url = "http://some.url/"                    => "http://some.url/"
-    # 
+    #
     # Set the URL for subsequent calls to +perform+. It is acceptable
     # (and even recommended) to reuse Curl::Easy instances by reassigning
     # the URL between calls to +perform+.
-    # 
+    #
     def url=(u)
       set :url, u
     end
 
-    # 
+    #
     # call-seq:
     #   easy.proxy_url = string                          => string
-    # 
+    #
     # Set the URL of the HTTP proxy to use for subsequent calls to +perform+.
     # The URL should specify the the host name or dotted IP address. To specify
     # port number in this string, append :[port] to the end of the host name.
     # The proxy string may be prefixed with [protocol]:// since any such prefix
     # will be ignored. The proxy's port number may optionally be specified with
     # the separate option proxy_port .
-    # 
+    #
     # When you tell the library to use an HTTP proxy, libcurl will transparently
     # convert operations to HTTP even if you specify an FTP URL etc. This may have
     # an impact on what other features of the library you can use, such as
     # FTP specifics that don't work unless you tunnel through the HTTP proxy. Such
     # tunneling is activated with proxy_tunnel = true.
-    # 
+    #
     # libcurl respects the environment variables *http_proxy*, *ftp_proxy*,
     # *all_proxy* etc, if any of those is set. The proxy_url option does however
     # override any possibly set environment variables.
-    # 
+    #
     # Starting with libcurl 7.14.1, the proxy host string given in environment
     # variables can be specified the exact same way as the proxy can be set with
     # proxy_url, including protocol prefix (http://) and embedded user + password.
@@ -143,89 +155,89 @@ module Curl
       self.ssl_verify_host_integer=value
     end
 
-    # 
+    #
     # call-seq:
     #   easy.ssl_verify_host?                            => boolean
-    # 
+    #
     # Deprecated: call easy.ssl_verify_host instead
     # can be one of [0,1,2]
-    # 
+    #
     # Determine whether this Curl instance will verify that the server cert
     # is for the server it is known as.
-    # 
+    #
     def ssl_verify_host?
       ssl_verify_host.nil? ? false : (ssl_verify_host > 0)
     end
 
-    # 
+    #
     # call-seq:
     #   easy.interface = string                          => string
-    # 
+    #
     # Set the interface name to use as the outgoing network interface.
     # The name can be an interface name, an IP address or a host name.
-    # 
+    #
     def interface=(value)
       set :interface, value
     end
 
-    # 
+    #
     # call-seq:
     #   easy.userpwd = string                            => string
-    # 
+    #
     # Set the username/password string to use for subsequent calls to +perform+.
     # The supplied string should have the form "username:password"
-    # 
+    #
     def userpwd=(value)
       set :userpwd, value
     end
 
-    # 
+    #
     # call-seq:
     #   easy.proxypwd = string                           => string
-    # 
+    #
     # Set the username/password string to use for proxy connection during
     # subsequent calls to +perform+. The supplied string should have the
     # form "username:password"
-    # 
+    #
     def proxypwd=(value)
       set :proxyuserpwd, value
     end
 
-    # 
+    #
     # call-seq:
     #   easy.cookies = "name1=content1; name2=content2;" => string
-    # 
+    #
     # Set cookies to be sent by this Curl::Easy instance. The format of the string should
     # be NAME=CONTENTS, where NAME is the cookie name and CONTENTS is what the cookie should contain.
     # Set multiple cookies in one string like this: "name1=content1; name2=content2;" etc.
-    # 
+    #
     def cookies=(value)
       set :cookie, value
     end
 
-    # 
+    #
     # call-seq:
     #   easy.cookiefile = string                         => string
-    # 
+    #
     # Set a file that contains cookies to be sent in subsequent requests by this Curl::Easy instance.
-    # 
+    #
     # *Note* that you must set enable_cookies true to enable the cookie
     # engine, or this option will be ignored.
-    # 
+    #
     def cookiefile=(value)
       set :cookiefile, value
     end
 
-    # 
+    #
     # call-seq:
     #   easy.cookiejar = string                          => string
-    # 
+    #
     # Set a cookiejar file to use for this Curl::Easy instance.
     # Cookies from the response will be written into this file.
-    # 
+    #
     # *Note* that you must set enable_cookies true to enable the cookie
     # engine, or this option will be ignored.
-    # 
+    #
     def cookiejar=(value)
       set :cookiejar, value
     end
@@ -403,35 +415,35 @@ module Curl
         c.http_delete
         c
       end
-    
+
       # call-seq:
       #   Curl::Easy.download(url, filename = url.split(/\?/).first.split(/\//).last) { |curl| ... }
-      #   
+      #
       # Stream the specified url (via perform) and save the data directly to the
-      # supplied filename (defaults to the last component of the URL path, which will 
+      # supplied filename (defaults to the last component of the URL path, which will
       # usually be the filename most simple urls).
-      # 
+      #
       # If a block is supplied, it will be passed the curl instance prior to the
       # perform call.
-      # 
+      #
       # *Note* that the semantics of the on_body handler are subtly changed when using
-      # download, to account for the automatic routing of data to the specified file: The 
+      # download, to account for the automatic routing of data to the specified file: The
       # data string is passed to the handler *before* it is written
-      # to the file, allowing the handler to perform mutative operations where 
+      # to the file, allowing the handler to perform mutative operations where
       # necessary. As usual, the transfer will be aborted if the on_body handler
-      # returns a size that differs from the data chunk size - in this case, the 
+      # returns a size that differs from the data chunk size - in this case, the
       # offending chunk will *not* be written to the file, the file will be closed,
       # and a Curl::Err::AbortedByCallbackError will be raised.
       def download(url, filename = url.split(/\?/).first.split(/\//).last, &blk)
         curl = Curl::Easy.new(url, &blk)
-        
+
         output = if filename.is_a? IO
           filename.binmode if filename.respond_to?(:binmode)
           filename
         else
           File.open(filename, 'wb')
         end
-        
+
         begin
           old_on_body = curl.on_body do |data|
             result = old_on_body ?  old_on_body.call(data) : data.length
@@ -442,7 +454,7 @@ module Curl
         ensure
           output.close rescue IOError
         end
-        
+
         return curl
       end
     end

data/lib/curl.rb

@@ -2,12 +2,14 @@ require 'curb_core'
 require 'curl/easy'
 require 'curl/multi'
 require 'uri'
+require 'cgi'
 
 # expose shortcut methods
 module Curl
   
   def self.http(verb, url, post_body=nil, put_data=nil, &block)
     handle = Thread.current[:curb_curl] ||= Curl::Easy.new
+    handle.reset
     handle.url = url
     handle.post_body = post_body if post_body
     handle.put_data = put_data if put_data
@@ -45,7 +47,7 @@ module Curl
   end
 
   def self.urlalize(url, params={})
-    query_str = params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
+    query_str = params.map {|k,v| "#{URI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&')
     if url.match(/\?/)
       "#{url}&#{query_str}"
     elsif query_str.size > 0
@@ -59,4 +61,8 @@ module Curl
     params.respond_to?(:map) ? URI.encode_www_form(params) : (params.respond_to?(:to_s) ? params.to_s : params)
   end
 
+  def self.reset
+    Thread.current[:curb_curl] = Curl::Easy.new
+  end
+
 end

data/tests/bug_crash_on_progress.rb

@@ -5,7 +5,7 @@ class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugCrashOnDebug < Test::Unit::TestCase
   
-  def test_on_debug
+  def test_on_progress_raise
     server = WEBrick::HTTPServer.new( :Port => 9999 )
     server.mount_proc("/test") do|req,res|
       res.body = "hi"
@@ -30,4 +30,44 @@ class BugCrashOnDebug < Test::Unit::TestCase
   ensure
     server.shutdown
   end
+
+  def test_on_progress_abort
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+
+    # see: https://github.com/taf2/curb/issues/192,
+    # to pass:
+    # 
+    # c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    # c.on_progress do|x|
+    #   puts "we're in the progress callback"
+    #   false
+    # end
+    # c.perform
+    # 
+    #  notice no return keyword
+    #
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c.on_progress do|x|
+      puts "we're in the progress callback"
+      return false
+    end
+    c.perform
+
+    assert false, "should not reach this point"
+
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  ensure
+    server.shutdown
+  end
+
 end

data/tests/bug_issue102.rb

@@ -4,7 +4,7 @@ class BugIssue102 < Test::Unit::TestCase
 
   def test_interface
     test = "https://api.twitter.com/1/users/show.json?screen_name=TwitterAPI&include_entities=true"
-    ip = "192.168.1.61"
+    ip = "0.0.0.0"
 
     c = Curl::Easy.new do |curl|
       curl.url = test

data/tests/helper.rb

@@ -10,7 +10,12 @@ $:.unshift($LIBDIR)
 $:.unshift($EXTDIR)
 
 require 'curb'
-require 'test/unit'
+begin
+  require 'test/unit'
+rescue LoadError
+  gem 'test/unit'
+  require 'test/unit'
+end
 require 'fileutils'
 
 $TEST_URL = "file://#{URI.escape(File.expand_path(__FILE__).tr('\\','/').tr(':','|'))}"

data/tests/tc_curl_download.rb

@@ -6,7 +6,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   def setup
     server_setup
   end
-  
+
   def test_download_url_to_file_via_string
     dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")

data/tests/tc_curl_easy.rb

@@ -4,6 +4,12 @@ class FooNoToS
 end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
+  def test_global_reset
+    c = Curl.get($TEST_URL)
+    # in a Timeout block you should reset the thread current handle 
+    Curl.reset
+  end
+
   def test_threads
     t = []
     5.times do
@@ -11,7 +17,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
         5.times do
           c = Curl.get($TEST_URL)
           assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
           assert_equal "", c.header_str
+          assert_equal "", c.head
         end
       end
     end
@@ -22,6 +30,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_class_perform_01   
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+    assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
     assert_equal "", c.header_str
   end    
 
@@ -642,8 +651,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'))),
-      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+      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.http_post(fields)
     assert_match /HTTP POST file upload/, curl.body_str
@@ -671,7 +680,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_post_multipart_file_remote
     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')))
+    pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
     curl.http_post(pf)
     assert_match /HTTP POST file upload/, curl.body_str
     assert_match /Content-Disposition: form-data/, curl.body_str
@@ -719,7 +728,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert curl.http_put("message")
     assert_match /^PUT/, curl.body_str
     assert_match /message$/, curl.body_str
+    assert_match /message$/, curl.body
     assert_match /application\/json/, curl.header_str
+    assert_match /application\/json/, curl.head
   end 
   
   def test_put_data
@@ -850,7 +861,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_post_streaming
-    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README'))
+    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))
     
     pf = Curl::PostField.file("filename", readme)
 
@@ -1017,6 +1028,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     end
   end
 
+  def test_set_unsupported_options
+    curl = Curl::Easy.new
+    assert_raises TypeError do
+      curl.set(99999, 1)
+    end
+  end
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_multi.rb

@@ -466,7 +466,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     m.add(c)
     m.add(c)
   rescue => e
-    assert_equal Curl::Err::MultiBadEasyHandle, e.class
+    assert Curl::Err::MultiBadEasyHandle == e.class || Curl::Err::MultiAddedAlready == e.class
   end
 
   def test_multi_default_timeout