@@ -1629,7 +1629,7 @@ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
if (result != 0) {
// printf("error: %s\n", errors);
if (rbce->failure_proc != Qnil) {
- rb_funcall( rbce->failure_proc, idCall, 1, self );
+ rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
} else {
raise_curl_easy_error_exception(result);
}
@@ -1641,7 +1641,7 @@ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
}
else if (rbce->failure_proc != Qnil &&
(response_code >= 300 && response_code <= 999)) {
- rb_funcall( rbce->failure_proc, idCall, 1, self );
+ rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
}
return Qtrue;
ext/curb_easy.c
@@ -256,7 +256,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
if (result != 0) {
if (rbce->failure_proc != Qnil) {
- rb_funcall( rbce->failure_proc, idCall, 1, rbce->self );
+ rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
}
}
else if (rbce->success_proc != Qnil &&
@@ -266,7 +266,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
}
else if (rbce->failure_proc != Qnil &&
(response_code >= 300 && response_code <= 999)) {
- rb_funcall( rbce->failure_proc, idCall, 1, rbce->self );
+ rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
}
rbce->self = Qnil;
}
ext/curb_multi.c
@@ -471,7 +471,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
curl = Curl::Easy.new("#{$TEST_URL.gsub(/file:\/\//,'')}/not_here")
on_failure_called = false
curl.on_success {|c| } # make sure we get the failure call even though this handler is defined
- curl.on_failure {|c| on_failure_called = true }
+ curl.on_failure {|c,code| on_failure_called = true }
curl.perform
assert on_failure_called, "Failure handler not called"
end
tests/tc_curl_easy.rb
@@ -146,7 +146,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
#assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
end
- c1.on_failure do|c|
+ c1.on_failure do|c,rc|
#puts "failure called: #{c.body_str.inspect}"
end
tests/tc_curl_multi.rb
22ec67496b54a808c6a6fd3078c78a8cf09905e7
Todd A. Fisher
taf2@web3.anerian.com
http://github.com/taf2/curb/commit/4a8bd7e66be3ca27d0ce86850d46cfe82bce0d4f
4a8bd7e66be3ca27d0ce86850d46cfe82bce0d4f
2009-06-17T18:19:28-07:00
2009-06-17T18:19:28-07:00
include libcurl error code in on_failure callbacks
869b1fe819a67384b76419205261d3d2413e20d2
Todd A. Fisher
taf2@web3.anerian.com