curb 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce5f49b09bacccf705e3d25ba29031dd4fc82c2721860eef02bb4a8af2dd0e2
-  data.tar.gz: 9456ed69688f2236bdd17f338e26faaf46b91f0fd4e51b3a48d5551ff8fdc433
+  metadata.gz: e28b1d05b46460867acfadc87bbe422d58d8f2cdb93397fa6ded906b01cd7dab
+  data.tar.gz: 33e7037c1c2b23a793ec96c73bc80c008939c880702f884d2b258d4afd18c368
 SHA512:
-  metadata.gz: df6ab81576ef567878331724c1600c59ff923be34d3a71bd31d07e4999880743e73c31a502bab8aaece54099fd5142bf954dbf004fffd38f0e6698750e3f9682
-  data.tar.gz: 5b7b867979da88d328e9f71a4a6eb7183430de26902311cb8678b443a6c53cf50aa62952f277bc2c2821bafc2af48c0e28067f7dce512ff7c2912b195bc27ad5
+  metadata.gz: 6eb448726a4fdce1e0832e36a45b2c8e0a078fbc2c04b3fe34f87fc38397f5c4ecc4fe621aed5637750c5c7a7a9d05b30c03f9f7db153c23d3694eb6adb464e8
+  data.tar.gz: 624e3f39af79eff874784a662776debc2b405378c6cdc963a50dee525d36aa225cc5f40558f9b35b396c222416006f66c29fc6193e651b5aa84093fdd52cb2ba

data/README.markdown

@@ -1,22 +1,57 @@
-# Curb - Libcurl bindings for Ruby [![Build Status](https://travis-ci.org/taf2/curb.svg?branch=master)](https://travis-ci.org/taf2/curb)
+# Curb - Libcurl bindings for Ruby
 
+* [CI Build Status](https://github.com/taf2/curb/actions/workflows/CI.yml)
 * [rubydoc rdoc](http://www.rubydoc.info/github/taf2/curb/)
 * [github project](http://github.com/taf2/curb/tree/master)
 
 Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
 libcurl(3), a fully-featured client-side URL transfer library.
-cURL and libcurl live at [http://curl.haxx.se/](http://curl.haxx.se/) .
+cURL and libcurl live at [https://curl.se/libcurl/](https://curl.se/libcurl/) .
 
 Curb is a work-in-progress, and currently only supports libcurl's `easy` and `multi` modes.
 
 ## License
 
-Curb is copyright (c)2006 Ross Bamford, and released under the terms of the
+Curb is copyright (c) 2006 Ross Bamford, and released under the terms of the
 Ruby license. See the LICENSE file for the gory details.
 
+## Easy mode
+
+GET request
+```
+  res = Curl.get("https://www.google.com/") {|http|
+    http.timeout = 10 # raise exception if request/response not handled within 10 seconds
+  }
+  puts res.code
+  puts res.head
+  puts res.body
+```
+
+POST request
+```
+  res = Curl.post("https://your-server.com/endpoint", {post: "this"}.to_json) {|http|
+    http.headers["Content-Type"] = "application/json"
+  }
+  puts res.code
+  puts res.head
+  puts res.body
+```
+
+PATCH request
+```
+  res = Curl.patch("https://your-server.com/endpoint", {post: "this"}.to_json) {|http|
+    http.headers["Content-Type"] = "application/json"
+  }
+  puts res.code
+  puts res.head
+  puts res.body
+```
+
+
+
 ## You will need
 
-* A working Ruby installation (`1.8.7+` will work but `2.1+` preferred)
+* A working Ruby installation (`2.0.0+` will work but `2.1+` preferred) (it's possible it still works with 1.8.7 but you'd have to tell me if not...)
 * A working libcurl development installation
 (Ideally one of the versions listed in the compatibility chart below that maps to your `curb` version)
 * A sane build environment (e.g. gcc, make)
@@ -29,7 +64,8 @@ tested and reported to work across a variety of platforms / rubies)
 
 | Gem Version | Release Date | libcurl versions |
 | ----------- | -----------  | ---------------- |
-| 0.9.8       | Jan 2019     | 7.58 - 7.63      |
+| 1.0.0       | Jan 2022     | 7.58 - 7.81      |
+| 0.9.8       | Jan 2019     | 7.58 - 7.81      |
 | 0.9.7       | Nov 2018     | 7.56 - 7.60      |
 | 0.9.6       | May 2018     | 7.51 - 7.59      |
 | 0.9.5       | May 2018     | 7.51 - 7.59      |
@@ -43,7 +79,7 @@ tested and reported to work across a variety of platforms / rubies)
     $ gem install curb
 
 On Windows, make sure you're using the [DevKit](http://rubyinstaller.org/downloads/) and
-the [development version of libcurl](http://curl.haxx.se/gknw.net/7.39.0/dist-w32/curl-7.39.0-devel-mingw32.zip). Unzip, then run this in your command
+the [development version of libcurl](http://curl.se/gknw.net/7.39.0/dist-w32/curl-7.39.0-devel-mingw32.zip). Unzip, then run this in your command
 line (alter paths to your curl location, but remember to use forward slashes):
 
     gem install curb --platform=ruby -- --with-curl-lib=C:/curl-7.39.0-devel-mingw32/lib --with-curl-include=C:/curl-7.39.0-devel-mingw32/include

data/Rakefile

@@ -2,6 +2,7 @@
 # 
 require 'rake/clean'
 require 'rake/testtask'
+require "ruby_memcheck"
 
 CLEAN.include '**/*.o'
 CLEAN.include "**/*.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
@@ -10,13 +11,6 @@ CLOBBER.include '**/*.log'
 CLOBBER.include '**/Makefile'
 CLOBBER.include '**/extconf.h'
 
-# Not available for really old rubies, but that's ok.
-begin
-  require 'pry'
-rescue LoadError
-  puts "Failed to load pry."
-end
-
 # Load support ruby and rake files (in this order)
 Dir.glob('tasks/*.rb').each { |r| load r}
 Dir.glob('tasks/*.rake').each { |r| load r}
@@ -97,6 +91,14 @@ else
   task :alltests => [:unittests, :bugtests]
 end
 
+RubyMemcheck.config(binary_name: 'curb_core')
+namespace :test do
+  RubyMemcheck::TestTask.new(valgrind: :compile) do|t|
+    t.test_files = FileList['tests/tc_*.rb']
+    t.verbose = false
+  end
+end
+
 Rake::TestTask.new(:unittests) do |t|
   t.test_files = FileList['tests/tc_*.rb']
   t.verbose = false

data/ext/curb.c

@@ -235,12 +235,16 @@ static VALUE ruby_curl_http2_q(VALUE mod) {
 #endif
 }
 
+static void finalize_curb_core(VALUE data) {
+  curl_global_cleanup();
+}
+
 void Init_curb_core() {
-  // TODO we need to call curl_global_cleanup at exit!
   curl_version_info_data *ver;
   VALUE curlver, curllongver, curlvernum;
 
   curl_global_init(CURL_GLOBAL_ALL);
+  rb_set_end_proc(finalize_curb_core, Qnil);
   ver = curl_version_info(CURLVERSION_NOW);
 
   mCurl = rb_define_module("Curl");
@@ -1072,6 +1076,10 @@ void Init_curb_core() {
   CURB_DEFINE(CURLOPT_HAPROXYPROTOCOL);
 #endif
 
+#if HAVE_CURLOPT_PROXY_SSL_VERIFYHOST
+  CURB_DEFINE(CURLOPT_PROXY_SSL_VERIFYHOST);
+#endif
+
 #if HAVE_CURLPROTO_RTMPTE
   CURB_DEFINE(CURLPROTO_RTMPTE);
 #endif

data/ext/curb.h

@@ -28,11 +28,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "1.0.0"
-#define CURB_VER_NUM   1000
+#define CURB_VERSION   "1.0.5"
+#define CURB_VER_NUM   1005
 #define CURB_VER_MAJ   1
 #define CURB_VER_MIN   0
-#define CURB_VER_MIC   0
+#define CURB_VER_MIC   5
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -34,7 +34,7 @@ static FILE * rb_io_stdio_file(rb_io_t *fptr) {
 
 /* ================== CURL HANDLER FUNCS ==============*/
 
-static VALUE callback_exception(VALUE unused) {
+static VALUE callback_exception(VALUE unused, VALUE exception) {
   return Qfalse;
 }
 
@@ -329,9 +329,9 @@ static VALUE ruby_curl_easy_allocate(VALUE klass) {
 
 /*
  * call-seq:
- *   Curl::Easy.new                                   => #<Curl::Easy...>
- *   Curl::Easy.new(url = nil)                        => #<Curl::Easy...>
- *   Curl::Easy.new(url = nil) { |self| ... }         => #<Curl::Easy...>
+ *   Curl::Easy.new                                   => #<Curl::Easy...>
+ *   Curl::Easy.new(url = nil)                        => #<Curl::Easy...>
+ *   Curl::Easy.new(url = nil) { |self| ... }         => #<Curl::Easy...>
  *
  * Initialize a new Curl::Easy instance, optionally supplying the URL.
  * The block form allows further configuration to be supplied before
@@ -376,8 +376,8 @@ static VALUE ruby_curl_easy_initialize(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.clone                                       => #&lt;easy clone&gt;
- *   easy.dup                                         => #&lt;easy clone&gt;
+ *   easy.clone                                       => <easy clone>
+ *   easy.dup                                         => <easy clone>
  *
  * Clone this Curl::Easy instance, creating a new instance.
  * This method duplicates the underlying CURL* handle.
@@ -957,7 +957,7 @@ static VALUE ruby_curl_easy_ftp_commands_set(VALUE self, VALUE ftp_commands) {
 }
 
 /*
- * call-seq
+ * call-seq:
  *   easy.ftp_commands                                => array or nil
  */
 static VALUE ruby_curl_easy_ftp_commands_get(VALUE self) {
@@ -976,7 +976,7 @@ static VALUE ruby_curl_easy_resolve_set(VALUE self, VALUE resolve) {
 }
 
 /*
- * call-seq
+ * call-seq:
  *   easy.resolve                                => array or nil
  */
 static VALUE ruby_curl_easy_resolve_get(VALUE self) {
@@ -1311,7 +1311,7 @@ static VALUE ruby_curl_easy_connect_timeout_set(VALUE self, VALUE connect_timeou
  * Obtain the maximum time in seconds that you allow the connection to the
  * server to take.
  */
-static VALUE ruby_curl_easy_connect_timeout_get(VALUE self, VALUE connect_timeout) {
+static VALUE ruby_curl_easy_connect_timeout_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, connect_timeout, 0);
 }
 
@@ -1337,7 +1337,7 @@ static VALUE ruby_curl_easy_connect_timeout_ms_set(VALUE self, VALUE connect_tim
  * Obtain the maximum time in milliseconds that you allow the connection to the
  * server to take.
  */
-static VALUE ruby_curl_easy_connect_timeout_ms_get(VALUE self, VALUE connect_timeout_ms) {
+static VALUE ruby_curl_easy_connect_timeout_ms_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, connect_timeout_ms, 0);
 }
 
@@ -1360,7 +1360,7 @@ static VALUE ruby_curl_easy_dns_cache_timeout_set(VALUE self, VALUE dns_cache_ti
  *
  * Obtain the dns cache timeout in seconds.
  */
-static VALUE ruby_curl_easy_dns_cache_timeout_get(VALUE self, VALUE dns_cache_timeout) {
+static VALUE ruby_curl_easy_dns_cache_timeout_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, dns_cache_timeout, -1);
 }
 
@@ -1387,7 +1387,7 @@ static VALUE ruby_curl_easy_ftp_response_timeout_set(VALUE self, VALUE ftp_respo
  *
  * Obtain the maximum time that libcurl will wait for FTP command responses.
  */
-static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self, VALUE ftp_response_timeout) {
+static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, ftp_response_timeout, 0);
 }
 
@@ -1410,7 +1410,7 @@ static VALUE ruby_curl_easy_low_speed_limit_set(VALUE self, VALUE low_speed_limi
  * Obtain the minimum transfer speed over +low_speed+time+ below which the
  * transfer will be aborted.
  */
-static VALUE ruby_curl_easy_low_speed_limit_get(VALUE self, VALUE low_speed_limit) {
+static VALUE ruby_curl_easy_low_speed_limit_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, low_speed_limit, 0);
 }
 
@@ -1432,7 +1432,7 @@ static VALUE ruby_curl_easy_low_speed_time_set(VALUE self, VALUE low_speed_time)
  * Obtain the time that the transfer should be below +low_speed_limit+ for
  * the library to abort it.
  */
-static VALUE ruby_curl_easy_low_speed_time_get(VALUE self, VALUE low_speed_time) {
+static VALUE ruby_curl_easy_low_speed_time_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, low_speed_time, 0);
 }
 
@@ -1452,7 +1452,7 @@ static VALUE ruby_curl_easy_max_send_speed_large_set(VALUE self, VALUE max_send_
  *
  * Get the maximal sending transfer speed (in bytes per second) 
  */
-static VALUE ruby_curl_easy_max_send_speed_large_get(VALUE self, VALUE max_send_speed_large) {
+static VALUE ruby_curl_easy_max_send_speed_large_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, max_send_speed_large, 0);
 }
 
@@ -1472,7 +1472,7 @@ static VALUE ruby_curl_easy_max_recv_speed_large_set(VALUE self, VALUE max_recv_
  *
  * Get the maximal receiving transfer speed (in bytes per second) 
  */
-static VALUE ruby_curl_easy_max_recv_speed_large_get(VALUE self, VALUE max_recv_speed_large) {
+static VALUE ruby_curl_easy_max_recv_speed_large_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, max_recv_speed_large, 0);
 }
 
@@ -1496,7 +1496,7 @@ static VALUE ruby_curl_easy_username_set(VALUE self, VALUE username) {
  *
  * Get the current username
  */
-static VALUE ruby_curl_easy_username_get(VALUE self, VALUE username) {
+static VALUE ruby_curl_easy_username_get(VALUE self) {
 #if HAVE_CURLOPT_USERNAME
   CURB_OBJECT_HGETTER(ruby_curl_easy, username);
 #else
@@ -1524,7 +1524,7 @@ static VALUE ruby_curl_easy_password_set(VALUE self, VALUE password) {
  *
  * Get the current password
  */
-static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
+static VALUE ruby_curl_easy_password_get(VALUE self) {
 #if HAVE_CURLOPT_PASSWORD
   CURB_OBJECT_HGETTER(ruby_curl_easy, password);
 #else
@@ -1558,7 +1558,7 @@ static VALUE ruby_curl_easy_ssl_version_set(VALUE self, VALUE ssl_version) {
  *
  * Get the version of SSL/TLS that libcurl will attempt to use.
  */
-static VALUE ruby_curl_easy_ssl_version_get(VALUE self, VALUE ssl_version) {
+static VALUE ruby_curl_easy_ssl_version_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, ssl_version, -1);
 }
 
@@ -1579,7 +1579,7 @@ static VALUE ruby_curl_easy_use_ssl_set(VALUE self, VALUE use_ssl) {
  *
  * Get the desired level for using SSL on FTP connections.
  */
-static VALUE ruby_curl_easy_use_ssl_get(VALUE self, VALUE use_ssl) {
+static VALUE ruby_curl_easy_use_ssl_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, use_ssl, -1);
 }
 
@@ -1595,12 +1595,12 @@ static VALUE ruby_curl_easy_ftp_filemethod_set(VALUE self, VALUE ftp_filemethod)
 }
 
 /*
- * call-seq
+ * call-seq:
  *   easy.ftp_filemethod                              => fixnum
  *
  * Get the configuration for how libcurl will reach files on the server.
  */
-static VALUE ruby_curl_easy_ftp_filemethod_get(VALUE self, VALUE ftp_filemethod) {
+static VALUE ruby_curl_easy_ftp_filemethod_get(VALUE self) {
   CURB_IMMED_GETTER(ruby_curl_easy, ftp_filemethod, -1);
 }
 
@@ -1967,7 +1967,7 @@ static VALUE ruby_curl_easy_resolve_mode_set(VALUE self, VALUE resolve_mode) {
 
 /*
  * call-seq:
- *   easy.on_body { |body_data| ... }                 => &lt;old handler&gt;
+ *   easy.on_body { |body_data| ... }                 => <old handler>
  *
  * Assign or remove the +on_body+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1986,7 +1986,7 @@ static VALUE ruby_curl_easy_on_body_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_success { |easy| ... }                   => &lt;old handler&gt;
+ *   easy.on_success { |easy| ... }                   => <old handler>
  *
  * Assign or remove the +on_success+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -2001,7 +2001,7 @@ static VALUE ruby_curl_easy_on_success_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_failure {|easy,code| ... }               => &lt;old handler&gt;
+ *   easy.on_failure {|easy,code| ... }               => <old handler>
  *
  * Assign or remove the +on_failure+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -2016,7 +2016,7 @@ static VALUE ruby_curl_easy_on_failure_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *  easy.on_missing {|easy,code| ... }                => &lt;old handler;&gt;
+ *  easy.on_missing {|easy,code| ... }                => <old handler;>
  *
  *  Assign or remove the on_missing handler for this Curl::Easy instance.
  *  To remove a previously-supplied handler, call this method with no attached
@@ -2031,7 +2031,7 @@ static VALUE ruby_curl_easy_on_missing_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *  easy.on_redirect {|easy,code| ... }                => &lt;old handler;&gt;
+ *  easy.on_redirect {|easy,code| ... }                => <old handler;>
  *
  *  Assign or remove the on_redirect handler for this Curl::Easy instance.
  *  To remove a previously-supplied handler, call this method with no attached
@@ -2046,7 +2046,7 @@ static VALUE ruby_curl_easy_on_redirect_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_complete {|easy| ... }                   => &lt;old handler&gt;
+ *   easy.on_complete {|easy| ... }                   => <old handler>
  *
  * Assign or remove the +on_complete+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -2060,7 +2060,7 @@ static VALUE ruby_curl_easy_on_complete_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_header { |header_data| ... }             => &lt;old handler&gt;
+ *   easy.on_header { |header_data| ... }             => <old handler>
  *
  * Assign or remove the +on_header+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -2076,7 +2076,7 @@ static VALUE ruby_curl_easy_on_header_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_progress { |dl_total, dl_now, ul_total, ul_now| ... } => &lt;old handler&gt;
+ *   easy.on_progress { |dl_total, dl_now, ul_total, ul_now| ... } => <old handler>
  *
  * Assign or remove the +on_progress+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -2097,7 +2097,7 @@ static VALUE ruby_curl_easy_on_progress_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_debug { |type, data| ... }               => &lt;old handler&gt;
+ *   easy.on_debug { |type, data| ... }               => <old handler>
  *
  * Assign or remove the +on_debug+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -2122,7 +2122,7 @@ static VALUE ruby_curl_easy_on_debug_set(int argc, VALUE *argv, VALUE self) {
 /***********************************************
  * This is an rb_iterate callback used to set up http headers.
  */
-static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
+static VALUE cb_each_http_header(VALUE header, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE header_str = Qnil;
 
@@ -2136,11 +2136,14 @@ static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
 
     name = rb_obj_as_string(rb_ary_entry(header, 0));
     value = rb_obj_as_string(rb_ary_entry(header, 1));
-
-    // This is a bit inefficient, but we don't want to be modifying
-    // the actual values in the original hash.
-    header_str = rb_str_plus(name, rb_str_new2(": "));
-    header_str = rb_str_plus(header_str, value);
+    if (rb_str_strlen(value) == 0) { // removing the header e.g. Accept: with nothing trailing should remove it see: https://curl.se/libcurl/c/CURLOPT_HTTPHEADER.html
+      header_str = rb_str_plus(name, rb_str_new2(":"));
+    } else {
+      // This is a bit inefficient, but we don't want to be modifying
+      // the actual values in the original hash.
+      header_str = rb_str_plus(name, rb_str_new2(": "));
+      header_str = rb_str_plus(header_str, value);
+    }
   } else {
     header_str = rb_obj_as_string(header);
   }
@@ -2154,7 +2157,7 @@ static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
 /***********************************************
  * This is an rb_iterate callback used to set up http proxy headers.
  */
-static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap) {
+static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE proxy_header_str = Qnil;
 
@@ -2186,7 +2189,7 @@ static VALUE cb_each_http_proxy_header(VALUE proxy_header, VALUE wrap) {
 /***********************************************
  * This is an rb_iterate callback used to set up ftp commands.
  */
-static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
+static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE ftp_command_string;
   Data_Get_Struct(wrap, struct curl_slist *, list);
@@ -2200,7 +2203,7 @@ static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
 /***********************************************
  * This is an rb_iterate callback used to set up the resolve list.
  */
-static VALUE cb_each_resolve(VALUE resolve, VALUE wrap) {
+static VALUE cb_each_resolve(VALUE resolve, VALUE wrap, int _c, const VALUE *_ptr, VALUE unused) {
   struct curl_slist **list;
   VALUE resolve_string;
   Data_Get_Struct(wrap, struct curl_slist *, list);
@@ -2599,7 +2602,7 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
   }
 
   // set values on cleanup to nil
-  rb_easy_del("multi");
+  //rb_easy_del("multi");
 
   return Qnil;
 }
@@ -2775,6 +2778,10 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
  * your own body handler, this string will be empty.
  */
 static VALUE ruby_curl_easy_body_str_get(VALUE self) {
+  /*
+     TODO: can we force_encoding on the return here if we see charset=utf-8 in the content-type header?
+     Content-Type: application/json; charset=utf-8
+  */
   CURB_OBJECT_HGETTER(ruby_curl_easy, body_data);
 }
 
@@ -3646,6 +3653,11 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   case CURLOPT_SSL_SESSIONID_CACHE:
     curl_easy_setopt(rbce->curl, CURLOPT_SSL_SESSIONID_CACHE, NUM2LONG(val));
     break;
+#endif
+#if HAVE_CURLOPT_PROXY_SSL_VERIFYHOST
+  case CURLOPT_PROXY_SSL_VERIFYHOST:
+    curl_easy_setopt(rbce->curl, CURLOPT_PROXY_SSL_VERIFYHOST, NUM2LONG(val));
+    break;
 #endif
   default:
     rb_raise(rb_eTypeError, "Curb unsupported option");
@@ -3763,6 +3775,7 @@ static VALUE ruby_curl_easy_error_message(VALUE klass, VALUE code) {
 }
 
 /* =================== INIT LIB =====================*/
+// TODO: https://bugs.ruby-lang.org/issues/18007
 void init_curb_easy() {
   idCall = rb_intern("call");
   idJoin = rb_intern("join");
@@ -3908,6 +3921,7 @@ void init_curb_easy() {
 
   rb_define_method(cCurlEasy, "last_effective_url", ruby_curl_easy_last_effective_url_get, 0);
   rb_define_method(cCurlEasy, "response_code", ruby_curl_easy_response_code_get, 0);
+  rb_define_method(cCurlEasy, "code", ruby_curl_easy_response_code_get, 0);
 #if defined(HAVE_CURLINFO_PRIMARY_IP)
   rb_define_method(cCurlEasy, "primary_ip", ruby_curl_easy_primary_ip_get, 0);
 #endif

data/ext/curb_macros.h

@@ -156,4 +156,16 @@
 #define CURB_DEFINE(name) \
   rb_define_const(mCurl, #name, LONG2NUM(name))
 
+/* copy and raise exception */
+#define CURB_CHECK_RB_CALLBACK_RAISE(did_raise) \
+  VALUE exception = rb_hash_aref(did_raise, rb_easy_hkey("error")); \
+  if (FIX2INT(rb_hash_size(did_raise)) > 0 && exception != Qnil) { \
+    rb_hash_clear(did_raise); \
+    VALUE message   = rb_funcall(exception, rb_intern("message"), 0); \
+    VALUE aborted_exception = rb_exc_new_str(eCurlErrAbortedByCallback, message); \
+    VALUE backtrace = rb_funcall(exception, rb_intern("backtrace"), 0); \
+    rb_funcall(aborted_exception,  rb_intern("set_backtrace"), 1, backtrace); \
+    rb_exc_raise(aborted_exception); \
+  }
+
 #endif