|
| 1 | +diff --git a/src/multi.c b/src/multi.c |
| 2 | +index 2e0be9c..3cf9332 100644 |
| 3 | +--- a/src/library/curl/src/multi.c |
| 4 | ++++ b/src/library/curl/src/multi.c |
| 5 | +@@ -1,6 +1,11 @@ |
| 6 | + #include "curl-common.h" |
| 7 | + #include <time.h> |
| 8 | + |
| 9 | ++#include <Rversion.h> |
| 10 | ++#if R_VERSION < R_Version(4, 5, 0) |
| 11 | ++# define R_ClosureFormals(x) FORMALS(x) |
| 12 | ++#endif |
| 13 | ++ |
| 14 | + /* Notes: |
| 15 | + * - First check for unhandled messages in curl_multi_info_read() before curl_multi_perform() |
| 16 | + * - Use Rf_eval() to callback instead of R_tryEval() to propagate interrupt or error back to C |
| 17 | +@@ -146,7 +151,7 @@ SEXP R_multi_run(SEXP pool_ptr, SEXP timeout, SEXP max){ |
| 18 | + if(status == CURLE_OK){ |
| 19 | + total_success++; |
| 20 | + if(Rf_isFunction(cb_complete)){ |
| 21 | +- int arglen = Rf_length(FORMALS(cb_complete)); |
| 22 | ++ int arglen = Rf_length(R_ClosureFormals(cb_complete)); |
| 23 | + SEXP out = PROTECT(make_handle_response(ref)); |
| 24 | + SET_VECTOR_ELT(out, 6, buf); |
| 25 | + SEXP call = PROTECT(Rf_lcons(cb_complete, arglen ? Rf_lcons(out, R_NilValue) : R_NilValue)); |
| 26 | +@@ -157,7 +162,7 @@ SEXP R_multi_run(SEXP pool_ptr, SEXP timeout, SEXP max){ |
| 27 | + } else { |
| 28 | + total_fail++; |
| 29 | + if(Rf_isFunction(cb_error)){ |
| 30 | +- int arglen = Rf_length(FORMALS(cb_error)); |
| 31 | ++ int arglen = Rf_length(R_ClosureFormals(cb_error)); |
| 32 | + SEXP buf = PROTECT(Rf_mkString(strlen(ref->errbuf) ? ref->errbuf : curl_easy_strerror(status))); |
| 33 | + SEXP call = PROTECT(Rf_lcons(cb_error, arglen ? Rf_lcons(buf, R_NilValue) : R_NilValue)); |
| 34 | + //R_tryEval(call, R_GlobalEnv, &cbfail); |
0 commit comments