Work around missing options in old libcurl, fixes #192

jeroen · Aug 27, 2019 · 327ae62 · 327ae62
1 parent 8f64a1a
commit 327ae62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/handle.c b/src/handle.c
@@ -338,7 +338,7 @@ SEXP R_handle_setopt(SEXP ptr, SEXP keys, SEXP values){
         error("Value for option %s (%d) must be a number.", optname, key);
       }
       assert(curl_easy_setopt(handle, key, (curl_off_t) asReal(val)));
-    } else if(r_curl_is_string_option(key) || r_curl_is_postfields_option(key)){
+    } else if(r_curl_is_postfields_option(key) || r_curl_is_string_option(key)){
       switch (TYPEOF(val)) {
       case RAWSXP:
         if(key == CURLOPT_POSTFIELDS || key == CURLOPT_COPYPOSTFIELDS)

diff --git a/src/typechecking.c b/src/typechecking.c
@@ -30,8 +30,12 @@ int r_curl_is_off_t_option(CURLoption x){
   return _curl_is_off_t_option(x);
 }
 
+/* workaround old curl bug: if an option is neither classified as string
+ * stringlist, we assume string: /~https://github.com/jeroen/curl/issues/192
+ */
 int r_curl_is_string_option(CURLoption x){
-  return _curl_is_string_option(x);
+  return _curl_is_string_option(x)  ||
+    (x > 10000 && x < 20000 && !r_curl_is_slist_option(x));
 }
 
 int r_curl_is_postfields_option(CURLoption x){