typhoeus 0.1.13 → 0.1.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/ext/typhoeus/extconf.rb +3 -2
- data/ext/typhoeus/typhoeus_multi.c +1 -2
- data/lib/typhoeus.rb +1 -1
- metadata +1 -1
data/ext/typhoeus/extconf.rb
CHANGED
|
@@ -5,8 +5,9 @@ ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
|
|
|
5
5
|
require 'mkmf'
|
|
6
6
|
|
|
7
7
|
ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
specified_curl = ARGV[0] =~ /^--with-curl/ ? ARGV[0].split("=")[1] : nil
|
|
9
|
+
LIBDIR = specified_curl ? "#{specified_curl}/lib": Config::CONFIG['libdir']
|
|
10
|
+
INCLUDEDIR = specified_curl ? "#{specified_curl}/include" : Config::CONFIG['includedir']
|
|
10
11
|
|
|
11
12
|
if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
|
|
12
13
|
$LIBRUBYARG_STATIC.gsub!(/-static/, '')
|
|
@@ -109,7 +109,7 @@ static void multi_read_info(VALUE self, CURLM *multi_handle) {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
|
|
112
|
-
/* called
|
|
112
|
+
/* called by multi_perform and fire_and_forget */
|
|
113
113
|
static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_running) {
|
|
114
114
|
CURLMcode mcode;
|
|
115
115
|
|
|
@@ -128,7 +128,6 @@ static VALUE fire_and_forget(VALUE self) {
|
|
|
128
128
|
CurlMulti *curl_multi;
|
|
129
129
|
Data_Get_Struct(self, CurlMulti, curl_multi);
|
|
130
130
|
rb_curl_multi_run( self, curl_multi->multi, &(curl_multi->running) );
|
|
131
|
-
// curl_multi_perform(curl_multi->multi, 0);
|
|
132
131
|
}
|
|
133
132
|
|
|
134
133
|
static VALUE multi_perform(VALUE self) {
|
data/lib/typhoeus.rb
CHANGED