typhoeus 0.1.13 → 0.1.14

data/ext/typhoeus/extconf.rb

@@ -5,8 +5,9 @@ ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
 require 'mkmf'
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-LIBDIR = Config::CONFIG['libdir']
-INCLUDEDIR = Config::CONFIG['includedir']
+specified_curl = ARGV[0] =~ /^--with-curl/ ? ARGV[0].split("=")[1] : nil
+LIBDIR = specified_curl ? "#{specified_curl}/lib": Config::CONFIG['libdir']
+INCLUDEDIR = specified_curl ? "#{specified_curl}/include" : Config::CONFIG['includedir']
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
   $LIBRUBYARG_STATIC.gsub!(/-static/, '')

data/ext/typhoeus/typhoeus_multi.c

@@ -109,7 +109,7 @@ static void multi_read_info(VALUE self, CURLM *multi_handle) {
   }
 }
 
-/* called within ruby_curl_multi_perform */
+/* called by multi_perform and fire_and_forget */
 static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_running) {
   CURLMcode mcode;
 
@@ -128,7 +128,6 @@ static VALUE fire_and_forget(VALUE self) {
   CurlMulti *curl_multi;
   Data_Get_Struct(self, CurlMulti, curl_multi);
   rb_curl_multi_run( self, curl_multi->multi, &(curl_multi->running) );
-//	curl_multi_perform(curl_multi->multi, 0);
 }
 
 static VALUE multi_perform(VALUE self) {

data/lib/typhoeus.rb

@@ -14,7 +14,7 @@ require 'typhoeus/request'
 require 'typhoeus/hydra'
 
 module Typhoeus
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 
   def self.easy_object_pool
     @easy_objects ||= []

metadata

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