curb 0.5.8.0-x86-linux → 0.7.7-x86-linux

data/ext/curb_postfield.c

@@ -41,7 +41,7 @@ void append_to_form(VALUE self,
       // is a file upload field
       if (rbcpf->content_proc != Qnil) {
         // with content proc
-        rbcpf->buffer_str = rb_funcall(rbcpf->content_proc, idCall, self);
+        rbcpf->buffer_str = rb_funcall(rbcpf->content_proc, idCall, 1, self);
         
         if (rbcpf->remote_file == Qnil) {
           rb_raise(eCurlErrInvalidPostField, "Cannot post file upload field with no filename");
@@ -281,7 +281,7 @@ static VALUE ruby_curl_postfield_new_file(int argc, VALUE *argv, VALUE klass) {
   rbcpf->content = Qnil;
   rbcpf->content_type = Qnil;
   rbcpf->buffer_str = Qnil;
-  
+ 
   return Data_Wrap_Struct(cCurlPostField, curl_postfield_mark, curl_postfield_free, rbcpf);
 }
 
@@ -428,9 +428,9 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
   Data_Get_Struct(self, ruby_curl_postfield, rbcpf);
 
   if ((rbcpf->local_file == Qnil) && (rbcpf->remote_file == Qnil)) {
-    if (rbcpf->name != Qnil) {
+    if (rbcpf->name != Qnil && rb_type(rbcpf->name) == T_STRING) {
 
-      char *tmpchrs = curl_escape(RSTRING_PTR(rbcpf->name), RSTRING_LEN(rbcpf->name));
+      char *tmpchrs = curl_escape(StringValuePtr(rbcpf->name), RSTRING_LEN(rbcpf->name));
       
       if (!tmpchrs) {
         rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name `%s'", tmpchrs);
@@ -465,14 +465,14 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
           result = escd_name;
           rb_str_cat(result, "=", 1);
           rb_str_concat(result, escd_content); 
-        }            
+        }
       }
     } else {
-      rb_raise(eCurlErrInvalidPostField, "Cannot convert unnamed field to string");
-    }      
+      rb_raise(eCurlErrInvalidPostField, "Cannot convert unnamed field to string %s:%d", __FILE__, __LINE__);
+    }
   } else {
-    rb_raise(eCurlErrInvalidPostField, "Cannot convert non-content field to string");
-  }  
+    rb_raise(eCurlErrInvalidPostField, "Local file and remote file are both nil %s:%d", __FILE__, __LINE__);
+  }
   
   return result;
 }

data/ext/extconf.rb

@@ -1,9 +1,10 @@
 require 'mkmf'
+puts $CFLAGS.inspect
 
 dir_config('curl')
 
 if find_executable('curl-config')
-  $CFLAGS << " #{`curl-config --cflags`.strip}"
+  $CFLAGS << " #{`curl-config --cflags`.strip} -g"
   if ENV['STATIC_BUILD']
     $LIBS << " #{`curl-config --static-libs`.strip}"
   else
@@ -24,15 +25,16 @@ elsif !have_library('curl') or !have_header('curl/curl.h')
 end
 
 # Check arch flags
-archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
-if archs and archs.size >= 1
-  # need to reduce the number of archs...
-  # guess the first one is correct... at least the first one is probably the ruby installed arch...
-  # this could lead to compiled binaries that crash at runtime...
-  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
-  $CFLAGS << " -arch #{archs.first}"
-  puts "Selected arch: #{archs.first}"
-end
+# TODO: detect mismatched arch types when libcurl mac ports is mixed with native mac ruby or vice versa
+#archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
+#if archs and archs.size >= 1
+#  # need to reduce the number of archs...
+#  # guess the first one is correct... at least the first one is probably the ruby installed arch...
+#  # this could lead to compiled binaries that crash at runtime...
+#  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
+#  $CFLAGS << " -arch #{archs.first}"
+#  puts "Selected arch: #{archs.first}"
+#end
 
 def define(s)
   $defs.push( format("-D HAVE_%s", s.to_s.upcase) )
@@ -109,6 +111,14 @@ have_constant "curle_again"
 have_constant "curle_ssl_crl_badfile"
 have_constant "curle_ssl_issuer_error"
 
+# username/password added in 7.19.1
+have_constant "curlopt_username"
+have_constant "curlopt_password"
+have_constant "curlinfo_primary_ip"
+
+# ie quirk added in 7.19.3
+have_constant "curlauth_digest_ie"
+
 # centos 4.5 build of libcurl
 have_constant "curlm_bad_socket"
 have_constant "curlm_unknown_option"

data/lib/curb.rb

@@ -1,6 +1,7 @@
 require 'curb_core'
 
 module Curl
+
   class Easy
     class << self
     
@@ -54,6 +55,7 @@ module Curl
       self.cert
     end
   end
+
   class Multi
     class << self
       # call-seq:
@@ -140,6 +142,7 @@ module Curl
         m = Curl::Multi.new
         # configure the multi handle
         multi_options.each { |k,v| m.send("#{k}=", v) }
+        callbacks = [:on_progress,:on_debug,:on_failure,:on_success,:on_body,:on_header]
 
         urls_with_config.each do|conf|
           c = conf.dup # avoid being destructive to input
@@ -149,6 +152,12 @@ module Curl
 
           easy    = Curl::Easy.new(url)
 
+          # assign callbacks
+          callbacks.each do |cb|
+            cbproc = c.delete(cb)
+            easy.send(cb,&cbproc) if cbproc
+          end
+
           case method
           when :post
             fields = c.delete(:post_fields)
@@ -179,6 +188,68 @@ module Curl
         end
         m.perform
       end
+
+      # call-seq:
+      #
+      # Curl::Multi.download(['http://example.com/p/a/t/h/file1.txt','http://example.com/p/a/t/h/file2.txt']){|c|}
+      #
+      # will create 2 new files file1.txt and file2.txt
+      # 
+      # 2 files will be opened, and remain open until the call completes
+      #
+      # when using the :post or :put method, urls should be a hash, including the individual post fields per post
+      #
+      def download(urls,easy_options={},multi_options={},download_paths=nil,&blk)
+        procs = []
+        files = []
+        urls_with_config = []
+        url_to_download_paths = {}
+
+        urls.each_with_index do|urlcfg,i|
+          if urlcfg.is_a?(Hash)
+            url = url[:url]
+          else
+            url = urlcfg
+          end
+
+          if download_paths and download_paths[i]
+            download_path = download_paths[i]
+          else
+            download_path = File.basename(url)
+          end
+
+          lambda do|dp|
+            file = File.open(dp,"wb")
+            procs << (lambda {|data| file.write data; data.size })
+            files << file
+          end.call(download_path)
+
+          if urlcfg.is_a?(Hash)
+            urls_with_config << urlcfg.merge({:on_body => procs.last}.merge(easy_options))
+          else
+            urls_with_config << {:url => url, :on_body => procs.last, :method => :get}.merge(easy_options)
+          end
+          url_to_download_paths[url] = download_path # store for later
+        end
+
+        if blk
+          Curl::Multi.http(urls_with_config, multi_options) {|c,code,method| blk.call(c,url_to_download_paths[c.url]) }
+        else
+          Curl::Multi.http(urls_with_config, multi_options)
+        end
+
+      ensure
+        errors = []
+        files.each {|f|
+          begin
+            f.close
+          rescue => e
+            errors << e
+          end
+        }
+        raise errors unless errors.empty?
+      end
+
     end
   end
 end

data/tests/bug_curb_easy_post_with_string_no_content_length_header.rb

@@ -0,0 +1,83 @@
+=begin
+From jwhitmire
+Todd, I'm trying to use curb to post data to a REST url. We're using it to post support questions from our iphone app directly to tender. The post looks good to me, but curl is not adding the content-length header so I get a 411 length required response from the server.
+
+Here's my post block, do you see anything obvious? Do I need to manually add the Content-Length header?
+
+c = Curl::Easy.http_post(url) do |curl|
+  curl.headers["User-Agent"] = "Curl/Ruby"
+  if user
+    curl.headers["X-Multipass"] = user.multipass
+  else
+    curl.headers["X-Tender-Auth"] = TOKEN
+  end
+  curl.headers["Accept"] = "application/vnd.tender-v1+json"
+
+  curl.post_body = params.map{|f,k| "#{curl.escape(f)}=#{curl.escape(k)}"}.join('&')
+
+  curl.verbose = true
+  curl.follow_location = true
+  curl.enable_cookies = true
+end
+Any insight you care to share would be helpful. Thanks.
+=end
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'webrick'
+class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
+class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
+
+class BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
+  def test_bug_workaround
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      assert_equal '15', req['Content-Length']
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+    params = {:cat => "hat", :foo => "bar"}
+
+    post_body = params.map{|f,k| "#{Curl::Easy.new.escape(f)}=#{Curl::Easy.new.escape(k)}"}.join('&')
+    c = Curl::Easy.http_post("http://127.0.0.1:9999/test",post_body) do |curl|
+      curl.headers["User-Agent"] = "Curl/Ruby"
+      curl.headers["X-Tender-Auth"] = "A Token"
+      curl.headers["Accept"] = "application/vnd.tender-v1+json"
+
+      curl.follow_location = true
+      curl.enable_cookies = true
+    end
+
+    server.shutdown
+    thread.join
+  end
+  def test_bug
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      assert_equal '15', req['Content-Length']
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+    params = {:cat => "hat", :foo => "bar"}
+
+    c = Curl::Easy.http_post("http://127.0.0.1:9999/test") do |curl|
+      curl.headers["User-Agent"] = "Curl/Ruby"
+      curl.headers["X-Tender-Auth"] = "A Token"
+      curl.headers["Accept"] = "application/vnd.tender-v1+json"
+
+      curl.post_body = params.map{|f,k| "#{curl.escape(f)}=#{curl.escape(k)}"}.join('&')
+
+      curl.follow_location = true
+      curl.enable_cookies = true
+    end
+
+    server.shutdown
+    thread.join
+  end
+end

data/tests/bug_multi_segfault.rb

@@ -6,5 +6,9 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','ext'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 require 'curb'
-multi = Curl::Multi.new
-exit
+
+class BugMultiSegfault < Test::Unit::TestCase
+  def test_bug
+    multi = Curl::Multi.new
+  end
+end

data/tests/bug_postfields_crash.rb

@@ -0,0 +1,26 @@
+# From GICodeWarrior:
+#
+# $ ruby crash_curb.rb 
+# crash_curb.rb:7: [BUG] Segmentation fault
+# ruby 1.8.7 (2009-06-12 patchlevel 174) [x86_64-linux]
+# 
+# Aborted
+# crash_curb.rb:
+# #!/usr/bin/ruby
+# require 'rubygems'
+# require 'curb'
+# 
+# curl = Curl::Easy.new('http://example.com/')
+# curl.multipart_form_post = true
+# curl.http_post(Curl::PostField.file('test', 'test.xml'){'example data'})
+# Ubuntu 9.10
+# curb gem version 0.6.2.1
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugPostFieldsCrash < Test::Unit::TestCase
+  def test_crash
+    curl = Curl::Easy.new('http://example.com/')
+    curl.multipart_form_post = true
+    curl.http_post(Curl::PostField.file('test', 'test.xml'){'example data'})
+  end
+end

data/tests/bug_postfields_crash2.rb

@@ -0,0 +1,57 @@
+# Not sure if this is an IRB bug, but thought you guys should know.
+#
+# ** My Ruby version: ruby 1.8.7 (2009-06-12 patchlevel 174) [x86_64-linux]
+# ** Version of Rubygems: 1.3.5
+# ** Version of the Curb gem: 0.6.6.0
+#
+#
+# Transcript of IRB session:
+# ------------------------------------------------------------------------------------------------------------------
+# irb(main):001:0>  a =  {
+# irb(main):002:1*     :type => :pie,
+# irb(main):003:1*     :series => {
+# irb(main):004:2*       :names => [:a,:b],
+# irb(main):005:2*       :values => [70,30],
+# irb(main):006:2*       :colors => [:red,:green]
+# irb(main):007:2>     },
+# irb(main):008:1*     :output_format => :png
+# irb(main):009:1>   }
+# => {:type=>:pie, :output_format=>:png, :series=>{:names=>[:a, :b], :values=>[70, 30], :colors=>[:red, :green]}}
+# irb(main):010:0> post = []
+# => []
+# irb(main):011:0> require 'rubygems'
+# => true
+# irb(main):012:0> require 'curb'
+# => true
+# irb(main):013:0> include Curl
+# => Object
+# irb(main):014:0> a.each_pair do |k,v|
+# irb(main):015:1* post << PostField.content(k,v)
+# irb(main):016:1> end
+# => {:type=>:pie, :output_format=>:png, :series=>{:names=>[:a, :b], :values=>[70, 30], :colors=>[:red, :green]}}
+# irb(main):017:0> post
+# /usr/lib/ruby/1.8/irb.rb:302: [BUG] Segmentation fault
+# ruby 1.8.7 (2009-06-12 patchlevel 174) [x86_64-linux]
+#
+# Aborted
+# ------------------------------------------------------------------------------------------------------------------
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugPostFieldsCrash2 < Test::Unit::TestCase
+  def test_crash
+    a =  {
+       :type => :pie,
+       :series => {
+         :names => [:a,:b],
+         :values => [70,30],
+         :colors => [:red,:green]
+       },
+       :output_format => :png
+    }
+    post = []
+    a.each_pair do |k,v|
+      post << Curl::PostField.content(k,v)
+    end
+    post.inspect
+  end
+end

data/tests/bugtests.rb

@@ -0,0 +1,9 @@
+$: << $TESTDIR = File.expand_path(File.dirname(__FILE__))
+puts "start"
+begin
+Dir[File.join($TESTDIR, 'bug_*.rb')].each { |lib| require lib }
+rescue Object => e
+  puts e.message
+ensure
+puts "done"
+end

data/tests/helper.rb

@@ -11,6 +11,7 @@ $:.unshift($EXTDIR)
 
 require 'curb'
 require 'test/unit'
+require 'fileutils'
 
 $TEST_URL = "file://#{URI.escape(File.expand_path(__FILE__).tr('\\','/').tr(':','|'))}"
 
@@ -59,6 +60,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def respond_with(method,req,res)
     res.body = method.to_s
+    $auth_header = req['Authorization']
     res['Content-Type'] = "text/plain"
   end
 
@@ -72,14 +74,18 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_POST(req,res)
-    if req.body
-      params = {}
-      req.body.split('&').map{|s| k,v=s.split('='); params[k] = v }
-    end
-    if params and params['s'] == '500'
-      res.status = 500
+    if req.query['filename'].nil?
+      if req.body
+        params = {}
+        req.body.split('&').map{|s| k,v=s.split('='); params[k] = v }
+      end
+      if params and params['s'] == '500'
+        res.status = 500
+      else
+        respond_with("POST\n#{req.body}",req,res)
+      end
     else
-      respond_with("POST\n#{req.body}",req,res)
+      respond_with(req.query['filename'],req,res)
     end
   end
 
@@ -92,6 +98,10 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
     respond_with(:DELETE,req,res)
   end
 
+  def do_PURGE(req,res)
+    respond_with(:PURGE,req,res)
+  end
+
 end
 
 module TestServerMethods