pauldix-typhoeus 0.0.11 → 0.0.12

data/ext/typhoeus/typhoeus_easy.c

@@ -105,34 +105,34 @@ static void set_response_handlers(VALUE easy, CURL *curl) {
   curl_easy_setopt(curl, CURLOPT_WRITEDATA, rb_iv_get(easy, "@response_body"));	
   curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)&write_data_handler);
   curl_easy_setopt(curl, CURLOPT_HEADERDATA, rb_iv_get(easy, "@response_header"));
-	
-	return NULL;
 }
 
 static VALUE easy_reset(VALUE self) {
 	CurlEasy *curl_easy;
 	Data_Get_Struct(self, CurlEasy, curl_easy);
 
-	curl_easy_reset(curl_easy->curl);
-
 	if (curl_easy->request_chunk != NULL) {
 		free(curl_easy->request_chunk);
+		curl_easy->request_chunk = NULL;
 	}
 	
 	if (curl_easy->headers != NULL) {
 		curl_slist_free_all(curl_easy->headers);
+		curl_easy->headers = NULL;
 	}
 
-	set_response_handlers(self, curl_easy->curl);
+	curl_easy_reset(curl_easy->curl);
 
+	set_response_handlers(self, curl_easy->curl);
+	
 	return Qnil;	
 }
 
 static VALUE easy_add_header(VALUE self, VALUE header) {
 	CurlEasy *curl_easy;
 	Data_Get_Struct(self, CurlEasy, curl_easy);
-
-	curl_easy->headers = curl_slist_append(curl_easy->headers, StringValuePtr(header));
+	
+	curl_easy->headers = curl_slist_append(curl_easy->headers, strdup(RSTRING_PTR(header)));
 	return header;
 }
 

data/lib/typhoeus/easy.rb

@@ -27,6 +27,10 @@ module Typhoeus
       @headers = {}
     end
     
+    def headers=(hash)
+      @headers = hash
+    end
+    
     def total_time_taken
       get_info_double(INFO_VALUES[:CURLINFO_TOTAL_TIME])
     end
@@ -119,12 +123,16 @@ module Typhoeus
     end
     
     def perform
+      set_headers()
+      easy_perform()
+      response_code()
+    end
+    
+    def set_headers
       headers.each_pair do |key, value|
         easy_add_header("#{key}: #{value}")
       end
       easy_set_headers() unless headers.empty?
-      easy_perform()
-      response_code()
     end
     
     # gets called when finished and response code is 200-299

data/lib/typhoeus/remote.rb

@@ -80,13 +80,12 @@ module Typhoeus
       
       easy.url                   = url
       easy.method                = method
-      easy.headers               = options[:headers] if options.has_key? :headers
+      easy.headers               = options[:headers] if options.has_key?(:headers)
       easy.headers["User-Agent"] = (options[:user_agent] || Typhoeus::USER_AGENT)
       easy.params                = options[:params] if options[:params]
       easy.request_body          = options[:body] if options[:body]
       easy.timeout               = options[:timeout] if options[:timeout]
-      
-      easy
+      easy.set_headers
       
       proxy = Typhoeus::RemoteProxyObject.new(clear_memoized_proxy_objects, easy, options)
       set_memoized_proxy_object(method, url, options, proxy)
@@ -122,7 +121,7 @@ module Typhoeus
       #     return object
       #   end
       # end
-      
+
       proxy = memoized_proxy_object(http_method, url, options)
       unless proxy
         if m.cache_responses?

data/lib/typhoeus.rb

@@ -12,7 +12,7 @@ require 'typhoeus/remote_proxy_object'
 require 'typhoeus/response'
 
 module Typhoeus
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
   
   def self.easy_object_pool
     @easy_objects ||= []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldix-typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Paul Dix