curb 0.7.3 → 0.7.4

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.7.3"
-#define CURB_VER_NUM   703
+#define CURB_VERSION   "0.7.4"
+#define CURB_VER_NUM   704
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   3
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -2287,6 +2287,40 @@ static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
 
   return onoff;
 }
+/*
+ *call-seq:
+ *
+ * easy = Curl::Easy.new("url")
+ * easy.version = Curl::HTTP_1_1
+ * easy.version = Curl::HTTP_1_0
+ * easy.version = Curl::HTTP_NONE
+ *
+ */
+static VALUE ruby_curl_easy_set_version(VALUE self, VALUE version) {
+  ruby_curl_easy *rbce;
+  //fprintf(stderr,"CURL_HTTP_VERSION_1_1: %d, CURL_HTTP_VERSION_1_0: %d, CURL_HTTP_VERSION_NONE: %d\n", CURL_HTTP_VERSION_1_1, CURL_HTTP_VERSION_1_0, CURL_HTTP_VERSION_NONE);
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  curl_easy_setopt(rbce->curl, CURLOPT_HTTP_VERSION, FIX2INT(version));
+
+  return version;
+}
+/*
+ * call-seq:
+ *
+ * easy = Curl::Easy.new
+ * easy.nosignal = true
+ */
+static VALUE ruby_curl_easy_set_nosignal(VALUE self, VALUE onoff) {
+  ruby_curl_easy *rbce;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  curl_easy_setopt(rbce->curl, CURLOPT_NOSIGNAL, FIX2INT(onoff));
+
+  return onoff;
+}
 /*
  *call-seq:
  * easy = Curl::Easy.new("url") do|c|
@@ -3253,6 +3287,11 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "http_put", ruby_curl_easy_perform_put, 1);
   rb_define_method(cCurlEasy, "head=", ruby_curl_easy_set_head_option, 1);
   rb_define_method(cCurlEasy, "delete=", ruby_curl_easy_set_delete_option, 1);
+  rb_define_method(cCurlEasy, "version=", ruby_curl_easy_set_version, 1);
+  rb_define_const(mCurl, "HTTP_1_1", LONG2NUM(CURL_HTTP_VERSION_1_1));
+  rb_define_const(mCurl, "HTTP_1_0", LONG2NUM(CURL_HTTP_VERSION_1_0));
+  rb_define_const(mCurl, "HTTP_NONE", LONG2NUM(CURL_HTTP_VERSION_NONE));
+  rb_define_method(cCurlEasy, "nosignal=", ruby_curl_easy_set_nosignal, 1);
 
   /* Post-perform info methods */
   rb_define_method(cCurlEasy, "body_str", ruby_curl_easy_body_str_get, 0);

data/ext/curb_postfield.c

@@ -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(StringValuePtr(rbcpf->name), RSTRING_LEN(StringValue(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);
@@ -471,7 +471,7 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
       rb_raise(eCurlErrInvalidPostField, "Cannot convert unnamed field to string %s:%d", __FILE__, __LINE__);
     }
   } else {
-    rb_raise(eCurlErrInvalidPostField, "Cannot convert non-content field to string %s:%d", __FILE__, __LINE__);
+    rb_raise(eCurlErrInvalidPostField, "Local file and remote file are both nil %s:%d", __FILE__, __LINE__);
   }
   
   return result;

data/tests/tc_curl_easy.rb

@@ -731,6 +731,17 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     easy.http_get
   end
 
+  def test_easy_use_http_versions
+    easy = Curl::Easy.new
+    easy.url = TestServlet.url + "?query=foo"
+    #puts "http none: #{Curl::HTTP_NONE.inspect}"
+    #puts "http1.0: #{Curl::HTTP_1_0.inspect}"
+    #puts "http1.1: #{Curl::HTTP_1_1.inspect}"
+    easy.version = Curl::HTTP_1_1
+    #easy.verbose = true
+    easy.http_get
+  end
+
   include TestServerMethods 
 
   def setup

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Ross Bamford
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -04:00
+date: 2010-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -34,21 +34,21 @@ files:
 - Rakefile
 - doc.rb
 - ext/extconf.rb
-- lib/curb.rb
 - lib/curl.rb
+- lib/curb.rb
 - ext/curb.c
+- ext/curb_upload.c
+- ext/curb_postfield.c
 - ext/curb_easy.c
-- ext/curb_errors.c
 - ext/curb_multi.c
-- ext/curb_postfield.c
-- ext/curb_upload.c
-- ext/curb.h
-- ext/curb_easy.h
+- ext/curb_errors.c
 - ext/curb_errors.h
-- ext/curb_macros.h
 - ext/curb_multi.h
+- ext/curb.h
+- ext/curb_easy.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
+- ext/curb_macros.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -82,20 +82,20 @@ signing_key:
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/alltests.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/bugtests.rb
+- tests/mem_check.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.rb
+- tests/tc_curl_postfield.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
+- tests/alltests.rb
 - tests/bug_postfields_crash.rb
-- tests/bug_postfields_crash2.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/bugtests.rb
-- tests/helper.rb
-- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/bug_postfields_crash2.rb
+- tests/unittests.rb
+- tests/tc_curl_multi.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb