curb 0.7.11 → 0.7.12

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.7.11"
-#define CURB_VER_NUM   711
+#define CURB_VERSION   "0.7.12"
+#define CURB_VER_NUM   712
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
 #define CURB_VER_MIC   1
-#define CURB_VER_PATCH 1
+#define CURB_VER_PATCH 2
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -815,7 +815,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
                                     the easy handle is active or until the upload
                                     is complete or terminated... */
 
-  curl_easy_setopt(curl, CURLOPT_NOBODY,0);
+  curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
   curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)read_data_handler);
   curl_easy_setopt(curl, CURLOPT_READDATA, rbce);
@@ -840,7 +840,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
 
   if (rb_respond_to(data, rb_intern("read"))) {
     VALUE stat = rb_funcall(data, rb_intern("stat"), 0);
-    if( stat ) {
+    if( stat && rb_hash_aref(headers, rb_str_new2("Content-Length")) == Qnil) {
       VALUE size;
       if( rb_hash_aref(headers, rb_str_new2("Expect")) == Qnil ) {
         rb_hash_aset(headers, rb_str_new2("Expect"), rb_str_new2(""));
@@ -851,6 +851,10 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
     else if( rb_hash_aref(headers, rb_str_new2("Content-Length")) == Qnil && rb_hash_aref(headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
       rb_hash_aset(headers, rb_str_new2("Transfer-Encoding"), rb_str_new2("chunked"));
     }
+    else if( rb_hash_aref(headers, rb_str_new2("Content-Length")) ) {
+      VALUE size = rb_funcall(rb_hash_aref(headers, rb_str_new2("Content-Length")), rb_intern("to_i"), 0);
+      curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2LONG(size));
+    }
   }
   else if (rb_respond_to(data, rb_intern("to_s"))) {
     curl_easy_setopt(curl, CURLOPT_INFILESIZE, RSTRING_LEN(data));

data/tests/tc_curl_easy.rb

@@ -855,10 +855,37 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_easy_can_put_with_content_length
     curl = Curl::Easy.new(TestServlet.url)
-    curl.headers['Content-Length'] = "hello".size
-    curl.http_put("hello")
-    assert_match /^PUT/, curl.body_str
-    assert_match /hello$/, curl.body_str
+    rd, wr = IO.pipe
+    buf = (("hello")* (1000 / 5))
+
+    producer = Thread.new do
+      5.times do
+        wr << buf
+        sleep 0.1 # act as a slow producer
+      end
+    end
+
+    consumer = Thread.new do
+
+      #curl.verbose = true
+      curl.headers['Content-Length'] = buf.size * 5
+      curl.headers['User-Agent']     = "Something else"
+      curl.headers['Content-Type']   = "text/javascript"
+      curl.headers['Date']           = Time.now.httpdate
+      curl.headers['Host']           = 's3.amazonaws.com'
+      curl.headers['Accept']         = '*/*'
+      curl.headers['Authorization']  = 'Foo Bar Biz Baz'
+      curl.http_put(rd)
+      assert_match /^PUT/, curl.body_str
+      assert_match /hello$/, curl.body_str
+      curl.header_str
+      curl.body_str
+    end
+
+    producer.join
+    wr.close
+    consumer.join
+
   end
 
   include TestServerMethods 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 7
-  - 11
-  version: 0.7.11
+  - 12
+  version: 0.7.12
 platform: ruby
 authors: 
 - Ross Bamford