Merge pull request #143 from geronime/master

Fix #133, fix warnings.
taf2 · Feb 6, 2013 · 0d11a1f · 0d11a1f
2 parents 713ae83 + 4e822de
commit 0d11a1f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/ext/curb_easy.c b/ext/curb_easy.c
@@ -703,8 +703,8 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
   curl = rbce->curl;
 
   if ( post_body == Qnil ) {
-    //rbce->postdata_buffer = Qnil;
     rb_easy_del("postdata_buffer");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
 
   } else {  
     if (rb_type(post_body) == T_STRING) {

diff --git a/lib/curb.rb b/lib/curb.rb
@@ -1,4 +1 @@
-require 'curb_core'
 require 'curl'
-require 'curl/easy'
-require 'curl/multi'
diff --git a/lib/curl.rb b/lib/curl.rb
@@ -1,4 +1,6 @@
-require 'curb'
+require 'curb_core'
+require 'curl/easy'
+require 'curl/multi'
 require 'uri'
 
 # expose shortcut methods

diff --git a/lib/curl/easy.rb b/lib/curl/easy.rb
@@ -310,7 +310,7 @@ class << self
       # the +http_get+ call.
       #
       def perform(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.perform
         c
@@ -327,7 +327,7 @@ def perform(*args)
       # the +http_get+ call.
       #
       def http_get(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_get
         c
@@ -344,7 +344,7 @@ def http_get(*args)
       # the +http_head+ call.
       #
       def http_head(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_head
         c
@@ -383,7 +383,7 @@ def http_post(*args)
         url = args.shift
         c = Curl::Easy.new url
         yield c if block_given?
-        c.http_post *args
+        c.http_post(*args)
         c
       end
 
@@ -398,7 +398,7 @@ def http_post(*args)
       # the +http_delete+ call.
       #
       def http_delete(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_delete
         c