curb 0.7.15 → 1.0.0

data/ext/curb_easy.c

@@ -25,9 +25,19 @@ static VALUE rbstrAmp;
 
 VALUE cCurlEasy;
 
+// for Ruby 1.8
+#ifndef HAVE_RB_IO_STDIO_FILE
+static FILE * rb_io_stdio_file(rb_io_t *fptr) {
+  return fptr->f;
+}
+#endif
 
 /* ================== CURL HANDLER FUNCS ==============*/
 
+static VALUE callback_exception(VALUE unused) {
+  return Qfalse;
+}
+
 /* These handle both body and header data */
 static size_t default_data_handler(char *stream,
                                    size_t size,
@@ -92,6 +102,25 @@ static size_t read_data_handler(void *ptr,
   }
 }
 
+int seek_data_handler(ruby_curl_easy *rbce,
+                      curl_off_t offset,
+                      int origin) {
+
+  VALUE upload = rb_easy_get("upload");
+  VALUE stream = ruby_curl_upload_stream_get(upload);
+
+  if (rb_respond_to(stream, rb_intern("seek"))) {
+    rb_funcall(stream, rb_intern("seek"), 2, SEEK_SET, offset);
+  } else {
+    ruby_curl_upload *rbcu;
+    Data_Get_Struct(upload, ruby_curl_upload, rbcu);
+    // This OK because curl only uses SEEK_SET as per the documentation
+    rbcu->offset = offset;
+  }
+
+  return 0;
+}
+
 static size_t proc_data_handler(char *stream,
                                 size_t size,
                                 size_t nmemb,
@@ -111,27 +140,81 @@ static size_t proc_data_handler(char *stream,
   }
 }
 
+static size_t proc_data_handler_body(char *stream,
+                                     size_t size,
+                                     size_t nmemb,
+                                     ruby_curl_easy *rbce)
+{
+  size_t ret;
+  rbce->callback_active = 1;
+  ret = proc_data_handler(stream, size, nmemb, rb_easy_get("body_proc"));
+  rbce->callback_active = 0;
+  return ret;
+}
+static size_t proc_data_handler_header(char *stream,
+                                       size_t size,
+                                       size_t nmemb,
+                                       ruby_curl_easy *rbce)
+{
+  size_t ret;
+  rbce->callback_active = 1;
+  ret = proc_data_handler(stream, size, nmemb, rb_easy_get("header_proc"));
+  rbce->callback_active = 0;
+  return ret;
+}
+
+
+static VALUE call_progress_handler(VALUE ary) {
+  return rb_funcall(rb_ary_entry(ary, 0), idCall, 4,
+                    rb_ary_entry(ary, 1), // rb_float_new(dltotal),
+                    rb_ary_entry(ary, 2), // rb_float_new(dlnow),
+                    rb_ary_entry(ary, 3), // rb_float_new(ultotal),
+                    rb_ary_entry(ary, 4)); // rb_float_new(ulnow));
+}
+
 static int proc_progress_handler(VALUE proc,
                                  double dltotal,
                                  double dlnow,
                                  double ultotal,
                                  double ulnow) {
   VALUE procret;
+  VALUE callargs = rb_ary_new2(5);
 
-  procret = rb_funcall(proc, idCall, 4, rb_float_new(dltotal),
-                                        rb_float_new(dlnow),
-                                        rb_float_new(ultotal),
-                                        rb_float_new(ulnow));
+  rb_ary_store(callargs, 0, proc);
+  rb_ary_store(callargs, 1, rb_float_new(dltotal));
+  rb_ary_store(callargs, 2, rb_float_new(dlnow));
+  rb_ary_store(callargs, 3, rb_float_new(ultotal));
+  rb_ary_store(callargs, 4, rb_float_new(ulnow));
+
+	//v = rb_rescue(range_check, (VALUE)args, range_failed, 0);
+  //procret = rb_funcall(proc, idCall, 4, rb_float_new(dltotal),
+  //                                      rb_float_new(dlnow),
+  //                                      rb_float_new(ultotal),
+  //                                      rb_float_new(ulnow));
+  procret = rb_rescue(call_progress_handler, callargs, callback_exception, Qnil);
 
   return(((procret == Qfalse) || (procret == Qnil)) ? -1 : 0);
 }
 
+static VALUE call_debug_handler(VALUE ary) {
+  return rb_funcall(rb_ary_entry(ary, 0), idCall, 2,
+                    rb_ary_entry(ary, 1), // INT2NUM(type),
+                    rb_ary_entry(ary, 2)); // rb_str_new(data, data_len)
+}
 static int proc_debug_handler(CURL *curl,
                               curl_infotype type,
                               char *data,
                               size_t data_len,
                               VALUE proc) {
-  rb_funcall(proc, idCall, 2, INT2FIX(type), rb_str_new(data, data_len));
+  VALUE callargs = rb_ary_new2(3);
+  rb_ary_store(callargs, 0, proc);
+  rb_ary_store(callargs, 1, INT2NUM(type));
+  rb_ary_store(callargs, 2, rb_str_new(data, data_len));
+  rb_rescue(call_debug_handler, callargs, callback_exception, Qnil);
+  /* no way to indicate to libcurl that we should break out given an exception in the on_debug handler...
+   * this means exceptions will be swallowed
+   */
+  //rb_funcall(proc, idCall, 2, INT2NUM(type), rb_str_new(data, data_len));
   return 0;
 }
 
@@ -146,12 +229,31 @@ static void ruby_curl_easy_free(ruby_curl_easy *rbce) {
     curl_slist_free_all(rbce->curl_headers);
   }
 
+  if (rbce->curl_proxy_headers) {
+    curl_slist_free_all(rbce->curl_proxy_headers);
+  }
+
   if (rbce->curl_ftp_commands) {
     curl_slist_free_all(rbce->curl_ftp_commands);
   }
 
+  if (rbce->curl_resolve) {
+    curl_slist_free_all(rbce->curl_resolve);
+  }
+
   if (rbce->curl) {
+    /* disable any progress or debug events */
+    curl_easy_setopt(rbce->curl, CURLOPT_WRITEFUNCTION, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_WRITEDATA, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_HEADERFUNCTION, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_HEADERDATA, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_DEBUGFUNCTION, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_DEBUGDATA, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_VERBOSE, 0);
+    curl_easy_setopt(rbce->curl, CURLOPT_PROGRESSFUNCTION, NULL);
+    curl_easy_setopt(rbce->curl, CURLOPT_NOPROGRESS, 1);
     curl_easy_cleanup(rbce->curl);
+    rbce->curl = NULL;
   }
 }
 
@@ -166,8 +268,12 @@ void curl_easy_free(ruby_curl_easy *rbce) {
 static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->opts = rb_hash_new();
 
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   rbce->curl_headers = NULL;
+  rbce->curl_proxy_headers = NULL;
   rbce->curl_ftp_commands = NULL;
+  rbce->curl_resolve = NULL;
 
   /* various-typed opts */
   rbce->local_port = 0;
@@ -178,20 +284,25 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->proxy_auth_types = 0;
   rbce->max_redirs = -1;
   rbce->timeout = 0;
+  rbce->timeout_ms = 0;
   rbce->connect_timeout = 0;
+  rbce->connect_timeout_ms = 0;
   rbce->dns_cache_timeout = 60;
   rbce->ftp_response_timeout = 0;
   rbce->low_speed_limit = 0;
   rbce->low_speed_time = 0;
+  rbce->max_send_speed_large = 0;
+  rbce->max_recv_speed_large = 0;
   rbce->ssl_version = -1;
   rbce->use_ssl = -1;
   rbce->ftp_filemethod = -1;
+  rbce->resolve_mode = CURL_IPRESOLVE_WHATEVER;
 
   /* bool opts */
   rbce->proxy_tunnel = 0;
   rbce->fetch_file_time = 0;
   rbce->ssl_verify_peer = 1;
-  rbce->ssl_verify_host = 1;
+  rbce->ssl_verify_host = 2;
   rbce->header_in_body = 0;
   rbce->use_netrc = 0;
   rbce->follow_location = 0;
@@ -200,6 +311,20 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->multipart_form_post = 0;
   rbce->enable_cookies = 0;
   rbce->ignore_content_length = 0;
+  rbce->callback_active = 0;
+}
+
+/*
+ * Allocate space for a Curl::Easy instance.
+ */
+static VALUE ruby_curl_easy_allocate(VALUE klass) {
+  ruby_curl_easy *rbce;
+  rbce = ALLOC(ruby_curl_easy);
+  rbce->curl = NULL;
+  rbce->opts  = Qnil;
+  rbce->multi = Qnil;
+  ruby_curl_easy_zero(rbce);
+  return Data_Wrap_Struct(klass, curl_easy_mark, curl_easy_free, rbce);
 }
 
 /*
@@ -208,19 +333,18 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
  *   Curl::Easy.new(url = nil)                        => #<Curl::Easy...>
  *   Curl::Easy.new(url = nil) { |self| ... }         => #<Curl::Easy...>
  *
- * Create a new Curl::Easy instance, optionally supplying the URL.
+ * Initialize a new Curl::Easy instance, optionally supplying the URL.
  * The block form allows further configuration to be supplied before
  * the instance is returned.
  */
-static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
+static VALUE ruby_curl_easy_initialize(int argc, VALUE *argv, VALUE self) {
   CURLcode ecode;
   VALUE url, blk;
-  VALUE new_curl;
   ruby_curl_easy *rbce;
 
   rb_scan_args(argc, argv, "01&", &url, &blk);
 
-  rbce = ALLOC(ruby_curl_easy);
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
 
   /* handler */
   rbce->curl = curl_easy_init();
@@ -228,26 +352,26 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
     rb_raise(eCurlErrFailedInit, "Failed to initialize easy handle");
   }
 
-  new_curl = Data_Wrap_Struct(klass, curl_easy_mark, curl_easy_free, rbce);
-
   rbce->multi = Qnil;
   rbce->opts  = Qnil;
 
   ruby_curl_easy_zero(rbce);
 
+  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
+
   rb_easy_set("url", url);
 
-  /* set the new_curl pointer to the curl handle */
-  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)new_curl);
+  /* set the pointer to the curl handle */
+  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)self);
   if (ecode != CURLE_OK) {
     raise_curl_easy_error_exception(ecode);
   }
 
   if (blk != Qnil) {
-    rb_funcall(blk, idCall, 1, new_curl);
+    rb_funcall(blk, idCall, 1, self);
   }
 
-  return new_curl;
+  return self;
 }
 
 /*
@@ -267,7 +391,11 @@ static VALUE ruby_curl_easy_clone(VALUE self) {
   memcpy(newrbce, rbce, sizeof(ruby_curl_easy));
   newrbce->curl = curl_easy_duphandle(rbce->curl);
   newrbce->curl_headers = NULL;
+  newrbce->curl_proxy_headers = NULL;
   newrbce->curl_ftp_commands = NULL;
+  newrbce->curl_resolve = NULL;
+
+  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
 
   return Data_Wrap_Struct(cCurlEasy, curl_easy_mark, curl_easy_free, newrbce);
 }
@@ -277,7 +405,7 @@ static VALUE ruby_curl_easy_clone(VALUE self) {
  *   easy.close                                      => nil
  *
  * Close the Curl::Easy instance. Any open connections are closed
- * The easy handle is reinitialized.  If a previous multi handle was 
+ * The easy handle is reinitialized.  If a previous multi handle was
  * open it is set to nil and will be cleared after a GC.
  */
 static VALUE ruby_curl_easy_close(VALUE self) {
@@ -286,6 +414,10 @@ static VALUE ruby_curl_easy_close(VALUE self) {
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
+  if (rbce->callback_active) {
+    rb_raise(rb_eRuntimeError, "Cannot close an active curl handle within a callback");
+  }
+
   ruby_curl_easy_free(rbce);
 
   /* reinit the handle */
@@ -324,12 +456,19 @@ static VALUE ruby_curl_easy_reset(VALUE self) {
   ruby_curl_easy *rbce;
   VALUE opts_dup;
   Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (rbce->callback_active) {
+    rb_raise(rb_eRuntimeError, "Cannot close an active curl handle within a callback");
+  }
+
   opts_dup = rb_funcall(rbce->opts, rb_intern("dup"), 0);
 
   curl_easy_reset(rbce->curl);
   ruby_curl_easy_zero(rbce);
 
-  /* rest clobbers the private setting, so reset it to self */
+  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
+
+  /* reset clobbers the private setting, so reset it to self */
   ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)self);
   if (ecode != CURLE_OK) {
     raise_curl_easy_error_exception(ecode);
@@ -341,24 +480,18 @@ static VALUE ruby_curl_easy_reset(VALUE self) {
     rbce->curl_headers = NULL;
   }
 
+  /* Free everything up */
+  if (rbce->curl_proxy_headers) {
+    curl_slist_free_all(rbce->curl_proxy_headers);
+    rbce->curl_proxy_headers = NULL;
+  }
+
   return opts_dup;
 }
 
 
 /* ================ OBJ ATTRIBUTES ==================*/
 
-/*
- * call-seq:
- *   easy.url = "http://some.url/"                    => "http://some.url/"
- *
- * Set the URL for subsequent calls to +perform+. It is acceptable
- * (and even recommended) to reuse Curl::Easy instances by reassigning
- * the URL between calls to +perform+.
- */
-static VALUE ruby_curl_easy_url_set(VALUE self, VALUE url) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, url);
-}
-
 /*
  * call-seq:
  *   easy.url                                         => string
@@ -369,35 +502,6 @@ static VALUE ruby_curl_easy_url_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, url);
 }
 
-/*
- * call-seq:
- *   easy.proxy_url = string                          => string
- *
- * Set the URL of the HTTP proxy to use for subsequent calls to +perform+.
- * The URL should specify the the host name or dotted IP address. To specify
- * port number in this string, append :[port] to the end of the host name.
- * The proxy string may be prefixed with [protocol]:// since any such prefix
- * will be ignored. The proxy's port number may optionally be specified with
- * the separate option proxy_port .
- *
- * When you tell the library to use an HTTP proxy, libcurl will transparently
- * convert operations to HTTP even if you specify an FTP URL etc. This may have
- * an impact on what other features of the library you can use, such as
- * FTP specifics that don't work unless you tunnel through the HTTP proxy. Such
- * tunneling is activated with proxy_tunnel = true.
- *
- * libcurl respects the environment variables *http_proxy*, *ftp_proxy*,
- * *all_proxy* etc, if any of those is set. The proxy_url option does however
- * override any possibly set environment variables.
- *
- * Starting with libcurl 7.14.1, the proxy host string given in environment
- * variables can be specified the exact same way as the proxy can be set with
- * proxy_url, including protocol prefix (http://) and embedded user + password.
-  */
-static VALUE ruby_curl_easy_proxy_url_set(VALUE self, VALUE proxy_url) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, proxy_url);
-}
-
 /*
  * call-seq:
  *   easy.proxy_url                                   => string
@@ -434,6 +538,10 @@ static VALUE ruby_curl_easy_headers_set(VALUE self, VALUE headers) {
   CURB_OBJECT_HSETTER(ruby_curl_easy, headers);
 }
 
+static VALUE ruby_curl_easy_proxy_headers_set(VALUE self, VALUE proxy_headers) {
+  CURB_OBJECT_HSETTER(ruby_curl_easy, proxy_headers);
+}
+
 /*
  * call-seq:
  *   easy.headers                                     => Hash, Array or Str
@@ -444,42 +552,55 @@ static VALUE ruby_curl_easy_headers_get(VALUE self) {
   ruby_curl_easy *rbce;
   VALUE headers;
   Data_Get_Struct(self, ruby_curl_easy, rbce);
-  headers = rb_easy_get("headers");//rb_hash_aref(rbce->opts, rb_intern("headers")); 
+  headers = rb_easy_get("headers");//rb_hash_aref(rbce->opts, rb_intern("headers"));
   if (headers == Qnil) { headers = rb_easy_set("headers", rb_hash_new()); }
   return headers;
 }
 
 /*
  * call-seq:
- *   easy.interface = string                          => string
+ *   easy.proxy_headers = "Header: val"                              => "Header: val"
+ *   easy.proxy_headers = {"Header" => "val" ..., "Header" => "val"} => {"Header: val", ...}
+ *   easy.proxy_headers = ["Header: val" ..., "Header: val"]         => ["Header: val", ...]
  *
- * Set the interface name to use as the outgoing network interface.
- * The name can be an interface name, an IP address or a host name.
+ *
+ * For example to set a standard or custom header:
+ *
+ *    easy.proxy_headers["MyHeader"] = "myval"
+ *
+ * To remove a standard header (this is useful when removing libcurls default
+ * 'Expect: 100-Continue' header when using HTTP form posts):
+ *
+ *    easy.proxy_headers["Expect"] = ''
+ *
+ * Anything passed to libcurl as a header will be converted to a string during
+ * the perform step.
  */
-static VALUE ruby_curl_easy_interface_set(VALUE self, VALUE interface_hm) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, interface_hm);
-}
 
 /*
  * call-seq:
- *   easy.interface                                   => string
+ *   easy.proxy_headers                                     => Hash, Array or Str
  *
- * Obtain the interface name that is used as the outgoing network interface.
- * The name can be an interface name, an IP address or a host name.
+ * Obtain the custom HTTP proxy_headers for following requests.
  */
-static VALUE ruby_curl_easy_interface_get(VALUE self) {
-  CURB_OBJECT_HGETTER(ruby_curl_easy, interface_hm);
+static VALUE ruby_curl_easy_proxy_headers_get(VALUE self) {
+  ruby_curl_easy *rbce;
+  VALUE proxy_headers;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  proxy_headers = rb_easy_get("proxy_headers");//rb_hash_aref(rbce->opts, rb_intern("proxy_headers"));
+  if (proxy_headers == Qnil) { proxy_headers = rb_easy_set("proxy_headers", rb_hash_new()); }
+  return proxy_headers;
 }
 
 /*
  * call-seq:
- *   easy.userpwd = string                            => string
+ *   easy.interface                                   => string
  *
- * Set the username/password string to use for subsequent calls to +perform+.
- * The supplied string should have the form "username:password"
+ * Obtain the interface name that is used as the outgoing network interface.
+ * The name can be an interface name, an IP address or a host name.
  */
-static VALUE ruby_curl_easy_userpwd_set(VALUE self, VALUE userpwd) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, userpwd);
+static VALUE ruby_curl_easy_interface_get(VALUE self) {
+  CURB_OBJECT_HGETTER(ruby_curl_easy, interface_hm);
 }
 
 /*
@@ -493,18 +614,6 @@ static VALUE ruby_curl_easy_userpwd_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, userpwd);
 }
 
-/*
- * call-seq:
- *   easy.proxypwd = string                           => string
- *
- * Set the username/password string to use for proxy connection during
- * subsequent calls to +perform+. The supplied string should have the
- * form "username:password"
- */
-static VALUE ruby_curl_easy_proxypwd_set(VALUE self, VALUE proxypwd) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, proxypwd);
-}
-
 /*
  * call-seq:
  *   easy.proxypwd                                    => string
@@ -517,19 +626,6 @@ static VALUE ruby_curl_easy_proxypwd_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, proxypwd);
 }
 
-
-/*
- * call-seq:
- *   easy.cookies = "name1=content1; name2=content2;" => string
- *
- * Set cookies to be sent by this Curl::Easy instance. The format of the string should
- * be NAME=CONTENTS, where NAME is the cookie name and CONTENTS is what the cookie should contain.
- * Set multiple cookies in one string like this: "name1=content1; name2=content2;" etc.
- */
-static VALUE ruby_curl_easy_cookies_set(VALUE self, VALUE cookies) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, cookies);
-}
-
 /*
  * call-seq:
  *   easy.cookies                                     => "name1=content1; name2=content2;"
@@ -540,19 +636,6 @@ static VALUE ruby_curl_easy_cookies_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, cookies);
 }
 
-/*
- * call-seq:
- *   easy.cookiefile = string                         => string
- *
- * Set a file that contains cookies to be sent in subsequent requests by this Curl::Easy instance.
- *
- * *Note* that you must set enable_cookies true to enable the cookie
- * engine, or this option will be ignored.
- */
-static VALUE ruby_curl_easy_cookiefile_set(VALUE self, VALUE cookiefile) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, cookiefile);
-}
-
 /*
  * call-seq:
  *   easy.cookiefile                                  => string
@@ -563,20 +646,6 @@ static VALUE ruby_curl_easy_cookiefile_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, cookiefile);
 }
 
-/*
- * call-seq:
- *   easy.cookiejar = string                          => string
- *
- * Set a cookiejar file to use for this Curl::Easy instance.
- * Cookies from the response will be written into this file.
- *
- * *Note* that you must set enable_cookies true to enable the cookie
- * engine, or this option will be ignored.
- */
-static VALUE ruby_curl_easy_cookiejar_set(VALUE self, VALUE cookiejar) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, cookiejar);
-}
-
 /*
  * call-seq:
  *   easy.cookiejar                                   => string
@@ -730,29 +799,29 @@ static VALUE ruby_curl_easy_useragent_get(VALUE self) {
 /*
  * call-seq:
  *   easy.post_body = "some=form%20data&to=send"      => string or nil
- * 
+ *
  * Sets the POST body of this Curl::Easy instance.  This is expected to be
  * URL encoded; no additional processing or encoding is done on the string.
  * The content-type header will be set to application/x-www-form-urlencoded.
- * 
+ *
  * This is handy if you want to perform a POST against a Curl::Multi instance.
  */
 static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
   ruby_curl_easy *rbce;
   CURL *curl;
-  
+
   char *data;
   long len;
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
-  
+
   curl = rbce->curl;
-  
+
   if ( post_body == Qnil ) {
-    //rbce->postdata_buffer = Qnil;
     rb_easy_del("postdata_buffer");
-    
-  } else {  
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
+
+  } else {
     if (rb_type(post_body) == T_STRING) {
       data = StringValuePtr(post_body);
       len = RSTRING_LEN(post_body);
@@ -765,19 +834,19 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
     else {
       rb_raise(rb_eRuntimeError, "post data must respond_to .to_s");
     }
-  
-    // Store the string, since it has to hang around for the duration of the 
+
+    // Store the string, since it has to hang around for the duration of the
     // request.  See CURLOPT_POSTFIELDS in the libcurl docs.
     //rbce->postdata_buffer = post_body;
     rb_easy_set("postdata_buffer", post_body);
-  
+
     curl_easy_setopt(curl, CURLOPT_POST, 1);
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
     curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, len);
-    
+
     return post_body;
   }
-  
+
   return Qnil;
 }
 
@@ -794,7 +863,7 @@ static VALUE ruby_curl_easy_post_body_get(VALUE self) {
 /*
  * call-seq:
  *   easy.put_data = data                             => ""
- * 
+ *
  * Points this Curl::Easy instance to data to be uploaded via PUT.  This
  * sets the request to a PUT type request - useful if you want to PUT via
  * a multi handle.
@@ -818,9 +887,15 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
   curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
   curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)read_data_handler);
+#if HAVE_CURLOPT_SEEKFUNCTION
+  curl_easy_setopt(curl, CURLOPT_SEEKFUNCTION, (curl_seek_callback)seek_data_handler);
+#endif
   curl_easy_setopt(curl, CURLOPT_READDATA, rbce);
+#if HAVE_CURLOPT_SEEKDATA
+  curl_easy_setopt(curl, CURLOPT_SEEKDATA, rbce);
+#endif
 
-  /* 
+  /*
    * we need to set specific headers for the PUT to work... so
    * convert the internal headers structure to a HASH if one is set
    */
@@ -834,7 +909,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
   if (NIL_P(data)) { return data; }
 
   headers = rb_easy_get("headers");
-  if( headers == Qnil ) { 
+  if( headers == Qnil ) {
     headers = rb_hash_new();
   }
 
@@ -846,14 +921,14 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
         rb_hash_aset(headers, rb_str_new2("Expect"), rb_str_new2(""));
       }
       size = rb_funcall(stat, rb_intern("size"), 0);
-      curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2LONG(size));
+      curl_easy_setopt(curl, CURLOPT_INFILESIZE, NUM2LONG(size));
     }
     else if( rb_hash_aref(headers, rb_str_new2("Content-Length")) == Qnil && rb_hash_aref(headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
       rb_hash_aset(headers, rb_str_new2("Transfer-Encoding"), rb_str_new2("chunked"));
     }
     else if( rb_hash_aref(headers, rb_str_new2("Content-Length")) ) {
       VALUE size = rb_funcall(rb_hash_aref(headers, rb_str_new2("Content-Length")), rb_intern("to_i"), 0);
-      curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2LONG(size));
+      curl_easy_setopt(curl, CURLOPT_INFILESIZE, NUM2LONG(size));
     }
   }
   else if (rb_respond_to(data, rb_intern("to_s"))) {
@@ -889,6 +964,25 @@ static VALUE ruby_curl_easy_ftp_commands_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, ftp_commands);
 }
 
+/*
+ * call-seq:
+ *   easy.resolve = [ "example.com:80:127.0.0.1" ]   => [ "example.com:80:127.0.0.1" ]
+ *
+ * Set the resolve list to statically resolve hostnames to IP addresses,
+ * bypassing DNS for matching hostname/port combinations.
+ */
+static VALUE ruby_curl_easy_resolve_set(VALUE self, VALUE resolve) {
+  CURB_OBJECT_HSETTER(ruby_curl_easy, resolve);
+}
+
+/*
+ * call-seq
+ *   easy.resolve                                => array or nil
+ */
+static VALUE ruby_curl_easy_resolve_get(VALUE self) {
+  CURB_OBJECT_HGETTER(ruby_curl_easy, resolve);
+}
+
 /* ================== IMMED ATTRS ==================*/
 
 /*
@@ -997,16 +1091,16 @@ static VALUE ruby_curl_easy_proxy_type_get(VALUE self) {
   (!strncmp("digest",node,6)) ? CURLAUTH_DIGEST : \
   (!strncmp("gssnegotiate",node,12)) ? CURLAUTH_GSSNEGOTIATE : \
   (!strncmp("ntlm",node,4)) ? CURLAUTH_NTLM : \
-  (!strncmp("any",node,3)) ? CURLAUTH_ANY : \
-  (!strncmp("anysafe",node,7)) ? CURLAUTH_ANYSAFE : 0
-#else 
+  (!strncmp("anysafe",node,7)) ? CURLAUTH_ANYSAFE : \
+  (!strncmp("any",node,3)) ? CURLAUTH_ANY : 0
+#else
 #define CURL_HTTPAUTH_STR_TO_NUM(node) \
   (!strncmp("basic",node,5)) ? CURLAUTH_BASIC : \
   (!strncmp("digest",node,6)) ? CURLAUTH_DIGEST : \
   (!strncmp("gssnegotiate",node,12)) ? CURLAUTH_GSSNEGOTIATE : \
   (!strncmp("ntlm",node,4)) ? CURLAUTH_NTLM : \
-  (!strncmp("any",node,3)) ? CURLAUTH_ANY : \
-  (!strncmp("anysafe",node,7)) ? CURLAUTH_ANYSAFE : 0
+  (!strncmp("anysafe",node,7)) ? CURLAUTH_ANYSAFE : \
+  (!strncmp("any",node,3)) ? CURLAUTH_ANY : 0
 #endif
 /*
  * call-seq:
@@ -1020,21 +1114,22 @@ static VALUE ruby_curl_easy_proxy_type_get(VALUE self) {
 static VALUE ruby_curl_easy_http_auth_types_set(int argc, VALUE *argv, VALUE self) {//VALUE self, VALUE http_auth_types) {
   ruby_curl_easy *rbce;
   VALUE args_ary;
-  int i, len;
+  long i, len;
   char* node = NULL;
-  long mask = 0x000000;
+  long mask = 0;
 
   rb_scan_args(argc, argv, "*", &args_ary);
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
-  len = (int)RARRAY_LEN(args_ary);
+  len = RARRAY_LEN(args_ary);
 
-  if (len == 1 && (TYPE(rb_ary_entry(args_ary,0)) == T_FIXNUM || rb_ary_entry(args_ary,0) == Qnil)) {
-    if (rb_ary_entry(args_ary,0) == Qnil) { 
+  if (len == 1 && (rb_ary_entry(args_ary,0) == Qnil || TYPE(rb_ary_entry(args_ary,0)) == T_FIXNUM ||
+        TYPE(rb_ary_entry(args_ary,0)) == T_BIGNUM)) {
+    if (rb_ary_entry(args_ary,0) == Qnil) {
       rbce->http_auth_types = 0;
     }
     else {
-      rbce->http_auth_types = NUM2INT(rb_ary_entry(args_ary,0));
+      rbce->http_auth_types = NUM2LONG(rb_ary_entry(args_ary,0));
     }
   }
   else {
@@ -1047,7 +1142,7 @@ static VALUE ruby_curl_easy_http_auth_types_set(int argc, VALUE *argv, VALUE sel
     }
     rbce->http_auth_types = mask;
   }
-  return INT2NUM(rbce->http_auth_types);
+  return LONG2NUM(rbce->http_auth_types);
 }
 
 /*
@@ -1112,7 +1207,7 @@ static VALUE ruby_curl_easy_max_redirects_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.timeout = fixnum or nil                     => fixnum or nil
+ *   easy.timeout = float, fixnum or nil              => numeric
  *
  * Set the maximum time in seconds that you allow the libcurl transfer
  * operation to take. Normally, name lookups can take a considerable time
@@ -1121,20 +1216,77 @@ static VALUE ruby_curl_easy_max_redirects_get(VALUE self) {
  *
  * Set to nil (or zero) to disable timeout (it will then only timeout
  * on the system's internal timeouts).
+ *
+ * Uses timeout_ms internally instead of timeout because it allows for
+ * better precision and libcurl will use the last set value when both
+ * timeout and timeout_ms are set.
+ *
  */
-static VALUE ruby_curl_easy_timeout_set(VALUE self, VALUE timeout) {
-  CURB_IMMED_SETTER(ruby_curl_easy, timeout, 0);
+static VALUE ruby_curl_easy_timeout_set(VALUE self, VALUE timeout_s) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (Qnil == timeout_s || NUM2DBL(timeout_s) <= 0.0) {
+    rbce->timeout_ms = 0;
+  } else {
+    rbce->timeout_ms = (unsigned long)(NUM2DBL(timeout_s) * 1000);
+  }
+
+  return DBL2NUM(rbce->timeout_ms / 1000.0);
 }
 
 /*
  * call-seq:
- *   easy.timeout                                     => fixnum or nil
+ *   easy.timeout                                     => numeric
  *
  * Obtain the maximum time in seconds that you allow the libcurl transfer
  * operation to take.
+ *
+ * Uses timeout_ms internally instead of timeout.
+ *
+ */
+static VALUE ruby_curl_easy_timeout_get(VALUE self) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  return DBL2NUM(rbce->timeout_ms / 1000.0);
+}
+
+/*
+ * call-seq:
+ *   easy.timeout_ms = fixnum or nil                  => fixnum or nil
+ *
+ * Set the maximum time in milliseconds that you allow the libcurl transfer
+ * operation to take. Normally, name lookups can take a considerable time
+ * and limiting operations to less than a few minutes risk aborting
+ * perfectly normal operations.
+ *
+ * Set to nil (or zero) to disable timeout (it will then only timeout
+ * on the system's internal timeouts).
+ */
+static VALUE ruby_curl_easy_timeout_ms_set(VALUE self, VALUE timeout_ms) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (Qnil == timeout_ms || NUM2DBL(timeout_ms) <= 0.0) {
+    rbce->timeout_ms = 0;
+  } else {
+    rbce->timeout_ms = NUM2ULONG(timeout_ms);
+  }
+
+  return ULONG2NUM(rbce->timeout_ms);
+}
+
+/*
+ * call-seq:
+ *   easy.timeout_ms                                  => fixnum or nil
+ *
+ * Obtain the maximum time in milliseconds that you allow the libcurl transfer
+ * operation to take.
  */
-static VALUE ruby_curl_easy_timeout_get(VALUE self, VALUE timeout) {
-  CURB_IMMED_GETTER(ruby_curl_easy, timeout, 0);
+static VALUE ruby_curl_easy_timeout_ms_get(VALUE self) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  return LONG2NUM(rbce->timeout_ms);
 }
 
 /*
@@ -1163,6 +1315,32 @@ static VALUE ruby_curl_easy_connect_timeout_get(VALUE self, VALUE connect_timeou
   CURB_IMMED_GETTER(ruby_curl_easy, connect_timeout, 0);
 }
 
+/*
+ * call-seq:
+ *   easy.connect_timeout_ms = fixnum or nil          => fixnum or nil
+ *
+ * Set the maximum time in milliseconds that you allow the connection to the
+ * server to take. This only limits the connection phase, once it has
+ * connected, this option is of no more use.
+ *
+ * Set to nil (or zero) to disable connection timeout (it will then only
+ * timeout on the system's internal timeouts).
+ */
+static VALUE ruby_curl_easy_connect_timeout_ms_set(VALUE self, VALUE connect_timeout_ms) {
+  CURB_IMMED_SETTER(ruby_curl_easy, connect_timeout_ms, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.connect_timeout_ms                          => fixnum or nil
+ *
+ * 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) {
+  CURB_IMMED_GETTER(ruby_curl_easy, connect_timeout_ms, 0);
+}
+
 /*
  * call-seq:
  *   easy.dns_cache_timeout = fixnum or nil           => fixnum or nil
@@ -1258,6 +1436,46 @@ static VALUE ruby_curl_easy_low_speed_time_get(VALUE self, VALUE low_speed_time)
   CURB_IMMED_GETTER(ruby_curl_easy, low_speed_time, 0);
 }
 
+/*
+ * call-seq:
+ *   easy.max_send_speed_large = fixnum or nil        => fixnum or nil
+ *
+ * Set the maximal sending transfer speed (in bytes per second) 
+ */
+static VALUE ruby_curl_easy_max_send_speed_large_set(VALUE self, VALUE max_send_speed_large) {
+  CURB_IMMED_SETTER(ruby_curl_easy, max_send_speed_large, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.max_send_speed_large = fixnum or nil        => fixnum or nil
+ *
+ * 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) {
+  CURB_IMMED_GETTER(ruby_curl_easy, max_send_speed_large, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.max_recv_speed_large = fixnum or nil        => fixnum or nil
+ *
+ * Set the maximal receiving transfer speed (in bytes per second) 
+ */
+static VALUE ruby_curl_easy_max_recv_speed_large_set(VALUE self, VALUE max_recv_speed_large) {
+  CURB_IMMED_SETTER(ruby_curl_easy, max_recv_speed_large, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.max_recv_speed_large = fixnum or nil        => fixnum or nil
+ *
+ * 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) {
+  CURB_IMMED_GETTER(ruby_curl_easy, max_recv_speed_large, 0);
+}
+
 /*
  * call-seq:
  *   easy.username = string                           => string
@@ -1275,7 +1493,7 @@ static VALUE ruby_curl_easy_username_set(VALUE self, VALUE username) {
 /*
  * call-seq:
  *   easy.username                                    => string
- * 
+ *
  * Get the current username
  */
 static VALUE ruby_curl_easy_username_get(VALUE self, VALUE username) {
@@ -1303,7 +1521,7 @@ static VALUE ruby_curl_easy_password_set(VALUE self, VALUE password) {
 /*
  * call-seq:
  *   easy.password                                    => string
- * 
+ *
  * Get the current password
  */
 static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
@@ -1319,8 +1537,16 @@ static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
  *   easy.ssl_version = value                         => fixnum or nil
  *
  * Sets the version of SSL/TLS that libcurl will attempt to use. Valid
- * options are Curl::CURL_SSLVERSION_TLSv1, Curl::CURL_SSLVERSION::SSLv2,
- * Curl::CURL_SSLVERSION_SSLv3 and Curl::CURL_SSLVERSION_DEFAULT
+ * options are:
+ *
+ *   Curl::CURL_SSLVERSION_DEFAULT
+ *   Curl::CURL_SSLVERSION_TLSv1 (TLS 1.x)
+ *   Curl::CURL_SSLVERSION_SSLv2
+ *   Curl::CURL_SSLVERSION_SSLv3
+ *   Curl::CURL_SSLVERSION_TLSv1_0
+ *   Curl::CURL_SSLVERSION_TLSv1_1
+ *   Curl::CURL_SSLVERSION_TLSv1_2
+ *   Curl::CURL_SSLVERSION_TLSv1_3
  */
 static VALUE ruby_curl_easy_ssl_version_set(VALUE self, VALUE ssl_version) {
   CURB_IMMED_SETTER(ruby_curl_easy, ssl_version, -1);
@@ -1339,7 +1565,7 @@ static VALUE ruby_curl_easy_ssl_version_get(VALUE self, VALUE ssl_version) {
 /*
  * call-seq:
  *   easy.use_ssl = value                             => fixnum or nil
- * 
+ *
  * Ensure libcurl uses SSL for FTP connections. Valid options are Curl::CURL_USESSL_NONE,
  * Curl::CURL_USESSL_TRY, Curl::CURL_USESSL_CONTROL, and Curl::CURL_USESSL_ALL.
  */
@@ -1453,7 +1679,7 @@ static VALUE ruby_curl_easy_ssl_verify_peer_q(VALUE self) {
 
 /*
  * call-seq:
- *   easy.ssl_verify_host = boolean                   => boolean
+ *   easy.ssl_verify_host = [0, 1, 2]                   => [0, 1, 2]
  *
  * Configure whether this Curl instance will verify that the server cert
  * is for the server it is known as. When true (the default) the server
@@ -1465,18 +1691,18 @@ static VALUE ruby_curl_easy_ssl_verify_peer_q(VALUE self) {
  * The server could be lying. To control lying, see ssl_verify_peer? .
  */
 static VALUE ruby_curl_easy_ssl_verify_host_set(VALUE self, VALUE ssl_verify_host) {
-  CURB_BOOLEAN_SETTER(ruby_curl_easy, ssl_verify_host);
+  CURB_IMMED_SETTER(ruby_curl_easy, ssl_verify_host, 0);
 }
 
 /*
  * call-seq:
- *   easy.ssl_verify_host?                            => boolean
+ *   easy.ssl_verify_host                            => number
  *
  * Determine whether this Curl instance will verify that the server cert
  * is for the server it is known as.
  */
-static VALUE ruby_curl_easy_ssl_verify_host_q(VALUE self) {
-  CURB_BOOLEAN_GETTER(ruby_curl_easy, ssl_verify_host);
+static VALUE ruby_curl_easy_ssl_verify_host_get(VALUE self) {
+  CURB_IMMED_GETTER(ruby_curl_easy, ssl_verify_host, 0);
 }
 
 /*
@@ -1524,17 +1750,6 @@ static VALUE ruby_curl_easy_use_netrc_q(VALUE self) {
   CURB_BOOLEAN_GETTER(ruby_curl_easy, use_netrc);
 }
 
-/*
- * call-seq:
- *   easy.follow_location = boolean                   => boolean
- *
- * Configure whether this Curl instance will follow Location: headers
- * in HTTP responses. Redirects will only be followed to the extent
- * specified by +max_redirects+.
- */
-static VALUE ruby_curl_easy_follow_location_set(VALUE self, VALUE follow_location) {
-  CURB_BOOLEAN_SETTER(ruby_curl_easy, follow_location);
-}
 /*
  * call-seq:
  *
@@ -1685,19 +1900,80 @@ static VALUE ruby_curl_easy_ignore_content_length_q(VALUE self) {
   CURB_BOOLEAN_GETTER(ruby_curl_easy, ignore_content_length);
 }
 
+/*
+ * call-seq:
+ *   easy.resolve_mode                                      => symbol
+ *
+ * Determines what type of IP address this Curl::Easy instance
+ * resolves DNS names to.
+ */
+static VALUE ruby_curl_easy_resolve_mode(VALUE self) {
+  ruby_curl_easy *rbce;
+  unsigned short rm;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
 
+  rm = rbce->resolve_mode;
 
-/* ================= EVENT PROCS ================== */
+  switch(rm) {
+    case CURL_IPRESOLVE_V4:
+      return rb_easy_sym("ipv4");
+    case CURL_IPRESOLVE_V6:
+      return rb_easy_sym("ipv6");
+    default:
+      return rb_easy_sym("auto");
+  }
+}
 
 /*
  * call-seq:
- *   easy.on_body { |body_data| ... }                 => &lt;old handler&gt;
+ *   easy.resolve_mode = symbol                             => symbol
  *
- * Assign or remove the +on_body+ handler for this Curl::Easy instance.
- * To remove a previously-supplied handler, call this method with no
- * attached block.
+ * Configures what type of IP address this Curl::Easy instance
+ * resolves DNS names to. Valid options are:
  *
- * The +on_body+ handler is called for each chunk of response body passed back
+ * [:auto]  resolves DNS names to all IP versions your system allows
+ * [:ipv4]  resolves DNS names to IPv4 only
+ * [:ipv6]  resolves DNS names to IPv6 only
+ */
+static VALUE ruby_curl_easy_resolve_mode_set(VALUE self, VALUE resolve_mode) {
+  if (TYPE(resolve_mode) != T_SYMBOL) {
+    rb_raise(rb_eTypeError, "Must pass a symbol");
+    return Qnil;
+  } else {
+    ruby_curl_easy *rbce;
+    ID resolve_mode_id;
+    Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+    resolve_mode_id = rb_to_id(resolve_mode);
+
+    if (resolve_mode_id == rb_intern("auto")) {
+      rbce->resolve_mode = CURL_IPRESOLVE_WHATEVER;
+      return resolve_mode;
+    } else if (resolve_mode_id == rb_intern("ipv4")) {
+      rbce->resolve_mode = CURL_IPRESOLVE_V4;
+      return resolve_mode;
+    } else if (resolve_mode_id == rb_intern("ipv6")) {
+      rbce->resolve_mode = CURL_IPRESOLVE_V6;
+      return resolve_mode;
+    } else {
+      rb_raise(rb_eArgError, "Must set to one of :auto, :ipv4, :ipv6");
+      return Qnil;
+    }
+  }
+}
+
+
+/* ================= EVENT PROCS ================== */
+
+/*
+ * call-seq:
+ *   easy.on_body { |body_data| ... }                 => &lt;old handler&gt;
+ *
+ * Assign or remove the +on_body+ handler for this Curl::Easy instance.
+ * To remove a previously-supplied handler, call this method with no
+ * attached block.
+ *
+ * The +on_body+ handler is called for each chunk of response body passed back
  * by libcurl during +perform+. It should perform any processing necessary,
  * and return the actual number of bytes handled. Normally, this will
  * equal the length of the data string, and CURL will continue processing.
@@ -1738,6 +2014,36 @@ static VALUE ruby_curl_easy_on_failure_set(int argc, VALUE *argv, VALUE self) {
   CURB_HANDLER_PROC_HSETTER(ruby_curl_easy, failure_proc);
 }
 
+/*
+ * call-seq:
+ *  easy.on_missing {|easy,code| ... }                => &lt;old handler;&gt;
+ *
+ *  Assign or remove the on_missing handler for this Curl::Easy instance.
+ *  To remove a previously-supplied handler, call this method with no attached
+ *  block.
+ *
+ *  The +on_missing+ handler is called when request is finished with a
+ *  status of 40x
+ */
+static VALUE ruby_curl_easy_on_missing_set(int argc, VALUE *argv, VALUE self) {
+  CURB_HANDLER_PROC_HSETTER(ruby_curl_easy, missing_proc);
+}
+
+/*
+ * call-seq:
+ *  easy.on_redirect {|easy,code| ... }                => &lt;old handler;&gt;
+ *
+ *  Assign or remove the on_redirect handler for this Curl::Easy instance.
+ *  To remove a previously-supplied handler, call this method with no attached
+ *  block.
+ *
+ *  The +on_redirect+ handler is called when request is finished with a
+ *  status of 30x
+ */
+static VALUE ruby_curl_easy_on_redirect_set(int argc, VALUE *argv, VALUE self) {
+  CURB_HANDLER_PROC_HSETTER(ruby_curl_easy, redirect_proc);
+}
+
 /*
  * call-seq:
  *   easy.on_complete {|easy| ... }                   => &lt;old handler&gt;
@@ -1816,9 +2122,12 @@ 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, struct curl_slist **list) {
+static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
+  struct curl_slist **list;
   VALUE header_str = Qnil;
 
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
   //rb_p(header);
 
   if (rb_type(header) == T_ARRAY) {
@@ -1842,28 +2151,80 @@ static VALUE cb_each_http_header(VALUE header, struct curl_slist **list) {
   return header_str;
 }
 
+/***********************************************
+ * 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) {
+  struct curl_slist **list;
+  VALUE proxy_header_str = Qnil;
+
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
+  //rb_p(proxy_header);
+
+  if (rb_type(proxy_header) == T_ARRAY) {
+    // we're processing a hash, proxy header is [name, val]
+    VALUE name, value;
+
+    name = rb_obj_as_string(rb_ary_entry(proxy_header, 0));
+    value = rb_obj_as_string(rb_ary_entry(proxy_header, 1));
+
+    // This is a bit inefficient, but we don't want to be modifying
+    // the actual values in the original hash.
+    proxy_header_str = rb_str_plus(name, rb_str_new2(": "));
+    proxy_header_str = rb_str_plus(proxy_header_str, value);
+  } else {
+    proxy_header_str = rb_obj_as_string(proxy_header);
+  }
+
+  //rb_p(header_str);
+
+  *list = curl_slist_append(*list, StringValuePtr(proxy_header_str));
+  return proxy_header_str;
+}
+
 /***********************************************
  * This is an rb_iterate callback used to set up ftp commands.
  */
-static VALUE cb_each_ftp_command(VALUE ftp_command, struct curl_slist **list) {
-  VALUE ftp_command_string = rb_obj_as_string(ftp_command);
+static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
+  struct curl_slist **list;
+  VALUE ftp_command_string;
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
+  ftp_command_string = rb_obj_as_string(ftp_command);
   *list = curl_slist_append(*list, StringValuePtr(ftp_command));
 
   return ftp_command_string;
 }
 
+/***********************************************
+ * This is an rb_iterate callback used to set up the resolve list.
+ */
+static VALUE cb_each_resolve(VALUE resolve, VALUE wrap) {
+  struct curl_slist **list;
+  VALUE resolve_string;
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
+  resolve_string = rb_obj_as_string(resolve);
+  *list = curl_slist_append(*list, StringValuePtr(resolve));
+
+  return resolve_string;
+}
+
 /***********************************************
  *
  * Setup a connection
  *
  * Always returns Qtrue, rb_raise on error.
  */
-VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
+VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
   // TODO this could do with a bit of refactoring...
   CURL *curl;
   VALUE url, _url = rb_easy_get("url");
   struct curl_slist **hdrs = &(rbce->curl_headers);
+  struct curl_slist **phdrs = &(rbce->curl_proxy_headers);
   struct curl_slist **cmds = &(rbce->curl_ftp_commands);
+  struct curl_slist **rslv = &(rbce->curl_resolve);
 
   curl = rbce->curl;
 
@@ -1872,8 +2233,6 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   }
 
   url = rb_check_string_type(_url);
-
-  // Need to configure the handler as per settings in rbce
   curl_easy_setopt(curl, CURLOPT_URL, StringValuePtr(url));
 
   // network stuff and auth
@@ -1921,8 +2280,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   // body/header procs
   if (!rb_easy_nil("body_proc")) {
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)&proc_data_handler);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, rb_easy_get("body_proc"));//rbce->body_proc);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)&proc_data_handler_body);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, rbce);
     /* clear out the body_data if it was set */
     rb_easy_del("body_data");
   } else {
@@ -1932,8 +2291,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   }
 
   if (!rb_easy_nil("header_proc")) {
-    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)&proc_data_handler);
-    curl_easy_setopt(curl, CURLOPT_HEADERDATA, rb_easy_get("header_proc"));
+    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)&proc_data_handler_header);
+    curl_easy_setopt(curl, CURLOPT_HEADERDATA, rbce);
     /* clear out the header_data if it was set */
     rb_easy_del("header_data");
   } else {
@@ -1976,22 +2335,30 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   curl_easy_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, rbce->proxy_tunnel);
   curl_easy_setopt(curl, CURLOPT_FILETIME, rbce->fetch_file_time);
   curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, rbce->ssl_verify_peer);
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, rbce->ssl_verify_peer);
+  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, rbce->ssl_verify_host);
 
   if ((rbce->use_netrc != Qnil) && (rbce->use_netrc != Qfalse)) {
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, CURL_NETRC_OPTIONAL);
+    curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
   } else {
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, CURL_NETRC_IGNORED);
+    curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_IGNORED);
   }
 
   curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, rbce->unrestricted_auth);
 
-  curl_easy_setopt(curl, CURLOPT_TIMEOUT, rbce->timeout);
+#if HAVE_CURLOPT_TIMEOUT_MS
+  curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, rbce->timeout_ms);
+#endif
+
   curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, rbce->connect_timeout);
+#if HAVE_CURLOPT_CONNECTTIMEOUT_MS
+  curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, rbce->connect_timeout_ms);
+#endif
   curl_easy_setopt(curl, CURLOPT_DNS_CACHE_TIMEOUT, rbce->dns_cache_timeout);
 
   curl_easy_setopt(curl, CURLOPT_IGNORE_CONTENT_LENGTH, rbce->ignore_content_length);
 
+  curl_easy_setopt(curl, CURLOPT_IPRESOLVE, rbce->resolve_mode);
+
 
 #if LIBCURL_VERSION_NUM >= 0x070a08
   curl_easy_setopt(curl, CURLOPT_FTP_RESPONSE_TIMEOUT, rbce->ftp_response_timeout);
@@ -2004,6 +2371,9 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, rbce->low_speed_limit);
   curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, rbce->low_speed_time);
 
+  curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, rbce->max_recv_speed_large);
+  curl_easy_setopt(curl, CURLOPT_MAX_SEND_SPEED_LARGE, rbce->max_send_speed_large);
+
   // Set up localport / proxy port
   // FIXME these won't get returned to default if they're unset Ruby
   if (rbce->proxy_port > 0) {
@@ -2036,21 +2406,20 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 #endif
   }
 
-  if (rbce->http_auth_types > 0) {
+  /*
+   * NOTE: we used to set CURLAUTH_ANY but see: http://curl.haxx.se/mail/lib-2015-06/0033.html
+   */
+  if (rbce->http_auth_types != 0) {
 #if LIBCURL_VERSION_NUM >= 0x070a06
     curl_easy_setopt(curl, CURLOPT_HTTPAUTH, rbce->http_auth_types);
-  } else {
-    curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
 #else
     rb_warn("Installed libcurl is too old to support http_auth_types");
 #endif
   }
 
-  if (rbce->proxy_auth_types > 0) {
+  if (rbce->proxy_auth_types != 0) {
 #if LIBCURL_VERSION_NUM >= 0x070a07
     curl_easy_setopt(curl, CURLOPT_PROXYAUTH, rbce->proxy_auth_types);
-  } else {
-    curl_easy_setopt(curl, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
 #else
     rb_warn("Installed libcurl is too old to support proxy_auth_types");
 #endif
@@ -2077,7 +2446,9 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   /* Set up HTTPS cert handling if necessary */
   if (!rb_easy_nil("cert")) {
-    curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, rb_easy_get_str("certtype"));
+    if (!rb_easy_nil("certtype")) {
+      curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, rb_easy_get_str("certtype"));
+    }
     curl_easy_setopt(curl, CURLOPT_SSLCERT, rb_easy_get_str("cert"));
     if (!rb_easy_nil("certpassword")) {
       curl_easy_setopt(curl, CURLOPT_SSLCERTPASSWD, rb_easy_get_str("certpassword"));
@@ -2086,13 +2457,15 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
       curl_easy_setopt(curl, CURLOPT_SSLKEY, rb_easy_get_str("cert_key"));
     }
   }
+
   if (!rb_easy_nil("cacert")) {
+    curl_easy_setopt(curl, CURLOPT_CAINFO, rb_easy_get_str("cacert"));
+  }
 #ifdef HAVE_CURL_CONFIG_CA
+  else {
     curl_easy_setopt(curl, CURLOPT_CAINFO, CURL_CONFIG_CA);
-#else
-    curl_easy_setopt(curl, CURLOPT_CAINFO, "/usr/local/share/curl/curl-ca-bundle.crt");
-#endif
   }
+#endif
 
 #ifdef CURL_VERSION_SSL
   if (rbce->ssl_version > 0) {
@@ -2107,7 +2480,7 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
     rb_warn("libcurl is not configured with SSL support");
   }
 #endif
-  
+
   if (rbce->ftp_filemethod > 0) {
     curl_easy_setopt(curl, CURLOPT_FTP_FILEMETHOD, rbce->ftp_filemethod);
   }
@@ -2122,7 +2495,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   if (!rb_easy_nil("headers")) {
     if (rb_easy_type_check("headers", T_ARRAY) || rb_easy_type_check("headers", T_HASH)) {
-      rb_iterate(rb_each, rb_easy_get("headers"), cb_each_http_header, (VALUE)hdrs);
+      VALUE wrap = Data_Wrap_Struct(rb_cObject, 0, 0, hdrs);
+      rb_iterate(rb_each, rb_easy_get("headers"), cb_each_http_header, wrap);
     } else {
       VALUE headers_str = rb_obj_as_string(rb_easy_get("headers"));
       *hdrs = curl_slist_append(*hdrs, StringValuePtr(headers_str));
@@ -2133,10 +2507,30 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
     }
   }
 
+#if HAVE_CURLOPT_PROXYHEADER
+  /* Setup HTTP proxy headers if necessary */
+  curl_easy_setopt(curl, CURLOPT_PROXYHEADER, NULL);   // XXX: maybe we shouldn't be clearing this?
+
+  if (!rb_easy_nil("proxy_headers")) {
+    if (rb_easy_type_check("proxy_headers", T_ARRAY) || rb_easy_type_check("proxy_headers", T_HASH)) {
+      VALUE wrap = Data_Wrap_Struct(rb_cObject, 0, 0, phdrs);
+      rb_iterate(rb_each, rb_easy_get("proxy_headers"), cb_each_http_proxy_header, wrap);
+    } else {
+      VALUE proxy_headers_str = rb_obj_as_string(rb_easy_get("proxy_headers"));
+      *phdrs = curl_slist_append(*hdrs, StringValuePtr(proxy_headers_str));
+    }
+
+    if (*phdrs) {
+      curl_easy_setopt(curl, CURLOPT_PROXYHEADER, *phdrs);
+    }
+  }
+#endif
+
   /* Setup FTP commands if necessary */
   if (!rb_easy_nil("ftp_commands")) {
     if (rb_easy_type_check("ftp_commands", T_ARRAY)) {
-      rb_iterate(rb_each, rb_easy_get("ftp_commands"), cb_each_ftp_command, (VALUE)cmds);
+      VALUE wrap = Data_Wrap_Struct(rb_cObject, 0, 0, cmds);
+      rb_iterate(rb_each, rb_easy_get("ftp_commands"), cb_each_ftp_command, wrap);
     }
 
     if (*cmds) {
@@ -2144,18 +2538,33 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
     }
   }
 
+#if HAVE_CURLOPT_RESOLVE
+  /* Setup resolve list if necessary */
+  if (!rb_easy_nil("resolve")) {
+    if (rb_easy_type_check("resolve", T_ARRAY)) {
+      VALUE wrap = Data_Wrap_Struct(rb_cObject, 0, 0, rslv);
+      rb_iterate(rb_each, rb_easy_get("resolve"), cb_each_resolve, wrap);
+    }
+
+    if (*rslv) {
+      curl_easy_setopt(curl, CURLOPT_RESOLVE, *rslv);
+    }
+  }
+#endif
+
   return Qnil;
 }
 /***********************************************
  *
  * Clean up a connection
  *
- * Always returns Qtrue.
+ * Always returns Qnil.
  */
 VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
 
   CURL *curl = rbce->curl;
   struct curl_slist *ftp_commands;
+  struct curl_slist *resolve;
 
   /* Free everything up */
   if (rbce->curl_headers) {
@@ -2163,12 +2572,23 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
     rbce->curl_headers = NULL;
   }
 
+  if (rbce->curl_proxy_headers) {
+    curl_slist_free_all(rbce->curl_proxy_headers);
+    rbce->curl_proxy_headers = NULL;
+  }
+
   ftp_commands = rbce->curl_ftp_commands;
   if (ftp_commands) {
     curl_slist_free_all(ftp_commands);
     rbce->curl_ftp_commands = NULL;
   }
 
+  resolve = rbce->curl_resolve;
+  if (resolve) {
+    curl_slist_free_all(resolve);
+    rbce->curl_resolve = NULL;
+  }
+
   /* clean up a PUT request's curl options. */
   if (!rb_easy_nil("upload")) {
     rb_easy_del("upload"); // set the upload object to Qnil to let the GC clean up
@@ -2178,57 +2598,10 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
     curl_easy_setopt(curl, CURLOPT_INFILESIZE, 0);
   }
 
-  return Qnil;
-}
-
-/***********************************************
- *
- * This is the main worker for the perform methods (get, post, head, put).
- * It's not surfaced as a Ruby method - instead, the individual request
- * methods are responsible for setting up stuff specific to that type,
- * then calling this to handle common stuff and do the perform.
- *
- * Always returns Qtrue, rb_raise on error.
- *
- */
-static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
-
-  VALUE ret;
-
-  /* reuse existing multi handle for this easy handle */
-  if (NIL_P(rbce->multi)) {
-    rbce->multi = ruby_curl_multi_new(cCurlMulti);
-  }
-  rb_funcall(rbce->multi, rb_intern("add"), 1, self );
-  ret = rb_funcall(rbce->multi, rb_intern("perform"), 0);
-
-  /* check for errors in the easy response and raise exceptions if anything went wrong and their is no on_failure handler */
-  if (rbce->last_result != 0 && rb_easy_nil("failure_proc")) {
-    raise_curl_easy_error_exception(rbce->last_result);
-  }
-
-  return ret;
-}
-
-/*
- * call-seq:
- *   easy.http_get                                    => true
- *
- * GET the currently configured URL using the current options set for
- * this Curl::Easy instance. This method always returns true, or raises
- * an exception (defined under Curl::Err) on error.
- */
-static VALUE ruby_curl_easy_perform_get(VALUE self) {
-  ruby_curl_easy *rbce;
-  CURL *curl;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-  curl = rbce->curl;
-
-  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
-  curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
+  // set values on cleanup to nil
+  rb_easy_del("multi");
 
-  return handle_perform(self,rbce);
+  return Qnil;
 }
 
 /*
@@ -2242,27 +2615,17 @@ static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, verb);
 
-  retval = handle_perform(self,rbce);
+  retval = rb_funcall(self, rb_intern("perform"), 0);
 
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
 
   return retval;
 }
 
-/*
- * call-seq:
- *   easy.http_delete
- *
- * DELETE the currently configured URL using the current options set for
- * this Curl::Easy instance. This method always returns true, or raises
- * an exception (defined under Curl::Err) on error.
- */
-static VALUE ruby_curl_easy_perform_delete(VALUE self) {
-  return ruby_curl_easy_perform_verb_str(self, "DELETE");
-}
-
 /*
  * call-seq:
  *   easy.http(verb)
@@ -2273,33 +2636,17 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
 static VALUE ruby_curl_easy_perform_verb(VALUE self, VALUE verb) {
   VALUE str_verb;
   if (rb_type(verb) == T_STRING) {
-    return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(verb));
+    return ruby_curl_easy_perform_verb_str(self, StringValueCStr(verb));
   }
   else if (rb_respond_to(verb,rb_intern("to_s"))) {
     str_verb = rb_funcall(verb, rb_intern("to_s"), 0);
-    return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(str_verb));
+    return ruby_curl_easy_perform_verb_str(self, StringValueCStr(str_verb));
   }
   else {
     rb_raise(rb_eRuntimeError, "Invalid HTTP VERB, must response to 'to_s'");
   }
 }
 
-/*
- * call-seq:
- *   easy.perform                                     => true
- *
- * Transfer the currently configured URL using the options set for this
- * Curl::Easy instance. If this is an HTTP URL, it will be transferred via
- * the GET or HEAD request method.
- */
-static VALUE ruby_curl_easy_perform(VALUE self) {
-  ruby_curl_easy *rbce;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-
-  return handle_perform(self,rbce);
-}
-
 /*
  * call-seq:
  *   easy.http_post("url=encoded%20form%20data;and=so%20on") => true
@@ -2335,6 +2682,8 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
 
   if (rbce->multipart_form_post) {
@@ -2345,6 +2694,17 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
     for (i = 0; i < argc; i++) {
       if (rb_obj_is_instance_of(argv[i], cCurlPostField)) {
         append_to_form(argv[i], &first, &last);
+      } else if (rb_type(argv[i]) == T_ARRAY) {
+        // see: https://github.com/rvanlieshout/curb/commit/8bcdefddc0162484681ebd1a92d52a642666a445
+        long c = 0, argv_len = RARRAY_LEN(argv[i]);
+        for (; c < argv_len; ++c) {
+          if (rb_obj_is_instance_of(rb_ary_entry(argv[i],c), cCurlPostField)) {
+            append_to_form(rb_ary_entry(argv[i],c), &first, &last);
+          } else {
+            rb_raise(eCurlErrInvalidPostField, "You must use PostFields only with multipart form posts");
+            return Qnil;
+          }
+        }
       } else {
         rb_raise(eCurlErrInvalidPostField, "You must use PostFields only with multipart form posts");
         return Qnil;
@@ -2353,7 +2713,7 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
 
     curl_easy_setopt(curl, CURLOPT_POST, 0);
     curl_easy_setopt(curl, CURLOPT_HTTPPOST, first);
-    ret = handle_perform(self,rbce);
+    ret = rb_funcall(self, rb_intern("perform"), 0);
     curl_formfree(first);
 
     return ret;
@@ -2375,114 +2735,11 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
         ruby_curl_easy_post_body_set(self, post_body);
       }
 
-      return handle_perform(self,rbce);
+      return rb_funcall(self, rb_intern("perform"), 0);
     }
   }
 }
 
-/*
- * call-seq:
- *   easy.http_head                                   => true
- *
- * Request headers from the currently configured URL using the HEAD
- * method and current options set for this Curl::Easy instance. This
- * method always returns true, or raises an exception (defined under
- * Curl::Err) on error.
- *
- */
-static VALUE ruby_curl_easy_perform_head(VALUE self) {
-  ruby_curl_easy *rbce;
-  CURL *curl;
-  VALUE ret;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-  curl = rbce->curl;
-
-  curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
-
-  ret = handle_perform(self,rbce);
-
-  curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
-  return ret;
-}
-
-/*
- *call-seq:
- * easy = Curl::Easy.new("url") do|c|
- *  c.head = true
- * end
- * easy.perform
- */
-static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
-  ruby_curl_easy *rbce;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-
-  if( onoff == Qtrue ) {
-    curl_easy_setopt(rbce->curl, CURLOPT_NOBODY, 1);
-  }
-  else {
-    curl_easy_setopt(rbce->curl, CURLOPT_NOBODY, 0);
-  }
-
-  return onoff;
-}
-/*
- *call-seq:
- *
- * easy = Curl::Easy.new("url")
- * easy.version = Curl::HTTP_1_1
- * easy.version = Curl::HTTP_1_0
- * easy.version = Curl::HTTP_NONE
- *
- */
-static VALUE ruby_curl_easy_set_version(VALUE self, VALUE version) {
-  ruby_curl_easy *rbce;
-  //fprintf(stderr,"CURL_HTTP_VERSION_1_1: %d, CURL_HTTP_VERSION_1_0: %d, CURL_HTTP_VERSION_NONE: %d\n", CURL_HTTP_VERSION_1_1, CURL_HTTP_VERSION_1_0, CURL_HTTP_VERSION_NONE);
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-
-  curl_easy_setopt(rbce->curl, CURLOPT_HTTP_VERSION, FIX2INT(version));
-
-  return version;
-}
-/*
- * call-seq:
- *
- * easy = Curl::Easy.new
- * easy.nosignal = true
- */
-static VALUE ruby_curl_easy_set_nosignal(VALUE self, VALUE onoff) {
-  ruby_curl_easy *rbce;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-
-  curl_easy_setopt(rbce->curl, CURLOPT_NOSIGNAL, (Qtrue == onoff) ? 1 : 0);
-
-  return onoff;
-}
-/*
- *call-seq:
- * easy = Curl::Easy.new("url") do|c|
- *  c.delete = true
- * end
- * easy.perform
- */
-static VALUE ruby_curl_easy_set_delete_option(VALUE self, VALUE onoff) {
-  ruby_curl_easy *rbce;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-
-  if( onoff == Qtrue ) {
-    curl_easy_setopt(rbce->curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-  }
-  else {
-    curl_easy_setopt(rbce->curl, CURLOPT_CUSTOMREQUEST, NULL);
-  }
-
-  return onoff;
-}
-
 /*
  * call-seq:
  *   easy.http_put(data)                              => true
@@ -2494,28 +2751,19 @@ static VALUE ruby_curl_easy_set_delete_option(VALUE self, VALUE onoff) {
 static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   ruby_curl_easy *rbce;
   CURL *curl;
-  
+
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
-  
+
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
-  
-  return handle_perform(self, rbce);
-}
 
-/*
- * call-seq:
- *   Curl::Easy.http_put(url, data) {|c| ... }
- *
- * see easy.http_put
- */
-static VALUE ruby_curl_easy_class_perform_put(VALUE klass, VALUE url, VALUE data) {
-  VALUE c = ruby_curl_easy_new(1, &url, klass);
-  ruby_curl_easy_perform_put(c, data);
-  return c;
+  return rb_funcall(self, rb_intern("perform"), 0);
 }
 
+
 /* =================== DATA FUNCS =============== */
 
 /*
@@ -2603,7 +2851,7 @@ static VALUE ruby_curl_easy_response_code_get(VALUE self) {
 static VALUE ruby_curl_easy_primary_ip_get(VALUE self) {
   ruby_curl_easy *rbce;
   char* ip;
-  
+
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl_easy_getinfo(rbce->curl, CURLINFO_PRIMARY_IP, &ip);
 
@@ -2659,7 +2907,7 @@ static VALUE ruby_curl_easy_file_time_get(VALUE self) {
   return LONG2NUM(time);
 #else
   rb_warn("Installed libcurl is too old to support file_time");
-  return INT2FIX(0);
+  return LONG2NUM(0);
 #endif
 }
 
@@ -2714,6 +2962,29 @@ static VALUE ruby_curl_easy_connect_time_get(VALUE self) {
   return rb_float_new(time);
 }
 
+/*
+ * call-seq:
+ *   easy.app_connect_time                         => float
+ *
+ * Retrieve the time, in seconds, it took from the start until the SSL/SSH
+ * connect/handshake to the remote host was completed. This time is most often
+ * very near to the pre transfer time, except for cases such as HTTP
+ * pipelining where the pretransfer time can be delayed due to waits in line
+ * for the pipeline and more.
+ */
+#if defined(HAVE_CURLINFO_APPCONNECT_TIME)
+static VALUE ruby_curl_easy_app_connect_time_get(VALUE self) {
+  ruby_curl_easy *rbce;
+  double time;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl_easy_getinfo(rbce->curl, CURLINFO_APPCONNECT_TIME, &time);
+
+  return rb_float_new(time);
+}
+#endif
+
+
 /*
  * call-seq:
  *   easy.pre_transfer_time                           => float
@@ -2796,11 +3067,41 @@ static VALUE ruby_curl_easy_redirect_count_get(VALUE self) {
   return LONG2NUM(count);
 #else
   rb_warn("Installed libcurl is too old to support redirect_count");
-  return INT2FIX(-1);
+  return LONG2NUM(-1);
 #endif
 
 }
 
+/*
+ * call-seq:
+ *   easy.redirect_url                               => "http://some.url" or nil
+ *
+ * Retrieve  the URL a redirect would take you to if you
+ * would enable CURLOPT_FOLLOWLOCATION.
+ *
+ * Requires libcurl 7.18.2 or higher, otherwise -1 is always returned.
+ */
+static VALUE ruby_curl_easy_redirect_url_get(VALUE self) {
+#ifdef HAVE_CURLINFO_REDIRECT_URL
+  ruby_curl_easy *rbce;
+  char* url;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl_easy_getinfo(rbce->curl, CURLINFO_REDIRECT_URL, &url);
+
+  if (url && url[0]) {    // curl returns empty string if none
+    return rb_str_new2(url);
+  } else {
+    return Qnil;
+  }
+#else
+  rb_warn("Installed libcurl is too old to support redirect_url");
+  return LONG2NUM(-1);
+#endif
+}
+
+
+
 /*
  * call-seq:
  *   easy.uploaded_bytes                              => float
@@ -2923,7 +3224,10 @@ static VALUE ruby_curl_easy_ssl_verify_result_get(VALUE self) {
 
 /* TODO CURLINFO_SSL_ENGINES
 
-Pass the address of a 'struct curl_slist *' to receive a linked-list of OpenSSL crypto-engines supported. Note that engines are normally implemented in separate dynamic libraries. Hence not all the returned engines may be available at run-time. NOTE: you must call curl_slist_free_all(3) on the list pointer once you're done with it, as libcurl will not free the data for you. (Added in 7.12.3)
+Pass the address of a 'struct curl_slist *' to receive a linked-list of OpenSSL crypto-engines supported.
+Note that engines are normally implemented in separate dynamic libraries.
+Hence not all the returned engines may be available at run-time.
+NOTE: you must call curl_slist_free_all(3) on the list pointer once you're done with it, as libcurl will not free the data for you. (Added in 7.12.3)
 */
 
 /*
@@ -3021,7 +3325,7 @@ static VALUE ruby_curl_easy_os_errno_get(VALUE self) {
   return LONG2NUM(result);
 #else
   rb_warn("Installed libcurl is too old to support os_errno");
-  return INT2FIX(0);
+  return LONG2NUM(0);
 #endif
 }
 
@@ -3050,17 +3354,45 @@ static VALUE ruby_curl_easy_num_connects_get(VALUE self) {
   return LONG2NUM(result);
 #else
   rb_warn("Installed libcurl is too old to support num_connects");
-  return INT2FIX(-1);
+  return LONG2NUM(-1);
 #endif
 }
 
 
-/* TODO this needs to be implemented.
+/*
+ * call-seq:
+ *   easy.cookielist                                => array
+ *
+ * Retrieves the cookies curl knows in an array of strings.
+ * Returned strings are in Netscape cookiejar format or in Set-Cookie format.
+ *
+ * See also option CURLINFO_COOKIELIST of curl_easy_getopt(3) to see how libcurl behaves.
+ *
+ * (requires libcurl 7.14.1 or higher, otherwise -1 is always returned).
+*/
+static VALUE ruby_curl_easy_cookielist_get(VALUE self) {
+#ifdef HAVE_CURLINFO_COOKIELIST
+  ruby_curl_easy *rbce;
+  struct curl_slist *cookies;
+  struct curl_slist *cookie;
+  VALUE rb_cookies;
 
-CURLINFO_COOKIELIST
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl_easy_getinfo(rbce->curl, CURLINFO_COOKIELIST, &cookies);
+  if (!cookies)
+    return Qnil;
+  rb_cookies = rb_ary_new();
+  for (cookie = cookies; cookie; cookie = cookie->next)
+    rb_ary_push(rb_cookies, rb_str_new2(cookie->data));
+  curl_slist_free_all(cookies);
+  return rb_cookies;
+
+#else
+    rb_warn("Installed libcurl is too old to support cookielist");
+    return INT2FIX(-1);
+#endif
+}
 
-Pass a pointer to a 'struct curl_slist *' to receive a linked-list of all cookies cURL knows (expired ones, too). Don't forget to curl_slist_free_all(3) the list after it has been used. If there are no cookies (cookies for the handle have not been enabled or simply none have been received) 'struct curl_slist *' will be set to point to NULL. (Added in 7.14.1)
-*/
 
 /* TODO this needs to be implemented. Could probably support CONNECT_ONLY by having this
  *      return an open Socket or something.
@@ -3099,6 +3431,239 @@ static VALUE ruby_curl_easy_ftp_entry_path_get(VALUE self) {
 #endif
 }
 
+/*
+ * call-seq:
+ *   easy.multi                                     => "#<Curl::Multi>"
+ */
+static VALUE ruby_curl_easy_multi_get(VALUE self) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  return rbce->multi;
+}
+
+/*
+ * call-seq:
+ *   easy.multi=multi                                    => "#<Curl::Multi>"
+ */
+static VALUE ruby_curl_easy_multi_set(VALUE self, VALUE multi) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  rbce->multi = multi;
+  return rbce->multi;
+}
+
+/*
+ * call-seq:
+ *   easy.last_result                                    => 0
+ */
+static VALUE ruby_curl_easy_last_result(VALUE self) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  return LONG2NUM(rbce->last_result);
+}
+
+/*
+ * call-seq:
+ *   easy.last_error                                     => "Error details" or nil
+ */
+static VALUE ruby_curl_easy_last_error(VALUE self) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (rbce->err_buf[0]) {    // curl returns NULL or empty string if none
+    return rb_str_new2(rbce->err_buf);
+  } else {
+    return Qnil;
+  }
+}
+
+/*
+ * call-seq:
+ *   easy.setopt Fixnum, value  => value
+ *
+ * Initial access to libcurl curl_easy_setopt
+ */
+static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
+  ruby_curl_easy *rbce;
+  long option = NUM2LONG(opt);
+  rb_io_t *open_f_ptr;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  switch (option) {
+  /* BEHAVIOR OPTIONS */
+  case CURLOPT_VERBOSE: {
+    VALUE verbose = val;
+    CURB_BOOLEAN_SETTER(ruby_curl_easy, verbose);
+    } break;
+  case CURLOPT_FOLLOWLOCATION: {
+    VALUE follow_location = val;
+    CURB_BOOLEAN_SETTER(ruby_curl_easy, follow_location);
+    } break;
+  /* TODO: CALLBACK OPTIONS */
+  /* TODO: ERROR OPTIONS */
+  /* NETWORK OPTIONS */
+  case CURLOPT_URL: {
+    VALUE url = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, url);
+    } break;
+  case CURLOPT_CUSTOMREQUEST:
+    curl_easy_setopt(rbce->curl, CURLOPT_CUSTOMREQUEST, NIL_P(val) ? NULL : StringValueCStr(val));
+    break;
+  case CURLOPT_HTTP_VERSION:
+    curl_easy_setopt(rbce->curl, CURLOPT_HTTP_VERSION, NUM2LONG(val));
+    break;
+  case CURLOPT_PROXY: {
+    VALUE proxy_url = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, proxy_url);
+    } break;
+  case CURLOPT_INTERFACE: {
+    VALUE interface_hm = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, interface_hm);
+    } break;
+  case CURLOPT_HEADER:
+  case CURLOPT_NOPROGRESS:
+  case CURLOPT_NOSIGNAL:
+#if HAVE_CURLOPT_PATH_AS_IS
+  case CURLOPT_PATH_AS_IS:
+#endif
+#if HAVE_CURLOPT_PIPEWAIT
+  case CURLOPT_PIPEWAIT:
+#endif
+  case CURLOPT_HTTPGET:
+  case CURLOPT_NOBODY: {
+    int type = rb_type(val);
+    VALUE value;
+    if (type == T_TRUE) {
+      value = rb_int_new(1);
+    } else if (type == T_FALSE) {
+      value = rb_int_new(0);
+    } else {
+      value = rb_funcall(val, rb_intern("to_i"), 0);
+    }
+    curl_easy_setopt(rbce->curl, option, NUM2LONG(value));
+    } break;
+  case CURLOPT_POST: {
+    curl_easy_setopt(rbce->curl, CURLOPT_POST, rb_type(val) == T_TRUE);
+  } break;
+  case CURLOPT_MAXCONNECTS: {
+    curl_easy_setopt(rbce->curl, CURLOPT_MAXCONNECTS, NUM2LONG(val));
+  } break;
+  case CURLOPT_POSTFIELDS: {
+    curl_easy_setopt(rbce->curl, CURLOPT_POSTFIELDS, NIL_P(val) ? NULL : StringValueCStr(val));
+  } break;
+  case CURLOPT_USERPWD: {
+    VALUE userpwd = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, userpwd);
+    } break;
+  case CURLOPT_PROXYUSERPWD: {
+    VALUE proxypwd = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, proxypwd);
+    } break;
+  case CURLOPT_COOKIE: {
+    VALUE cookies = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, cookies);
+    } break;
+  case CURLOPT_COOKIEFILE: {
+    VALUE cookiefile = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, cookiefile);
+    } break;
+  case CURLOPT_COOKIEJAR: {
+    VALUE cookiejar = val;
+    CURB_OBJECT_HSETTER(ruby_curl_easy, cookiejar);
+    } break;
+  case CURLOPT_TCP_NODELAY: {
+    curl_easy_setopt(rbce->curl, CURLOPT_TCP_NODELAY, NUM2LONG(val));
+    } break;
+  case CURLOPT_RANGE: {
+    curl_easy_setopt(rbce->curl, CURLOPT_RANGE, StringValueCStr(val));
+    } break;
+  case CURLOPT_RESUME_FROM: {
+    curl_easy_setopt(rbce->curl, CURLOPT_RESUME_FROM, NUM2LONG(val));
+    } break;
+  case CURLOPT_FAILONERROR: {
+    curl_easy_setopt(rbce->curl, CURLOPT_FAILONERROR, NUM2LONG(val));
+    } break;
+  case CURLOPT_SSL_CIPHER_LIST: {
+    curl_easy_setopt(rbce->curl, CURLOPT_SSL_CIPHER_LIST, StringValueCStr(val));
+    } break;
+  case CURLOPT_FORBID_REUSE: {
+    curl_easy_setopt(rbce->curl, CURLOPT_FORBID_REUSE, NUM2LONG(val));
+    } break;
+#if HAVE_CURLOPT_GSSAPI_DELEGATION
+  case CURLOPT_GSSAPI_DELEGATION: {
+    curl_easy_setopt(rbce->curl, CURLOPT_GSSAPI_DELEGATION, NUM2LONG(val));
+    } break;
+#endif
+#if HAVE_CURLOPT_UNIX_SOCKET_PATH
+  case CURLOPT_UNIX_SOCKET_PATH: {
+	curl_easy_setopt(rbce->curl, CURLOPT_UNIX_SOCKET_PATH, StringValueCStr(val));
+    } break;
+#endif
+#if HAVE_CURLOPT_MAX_SEND_SPEED_LARGE
+  case CURLOPT_MAX_SEND_SPEED_LARGE: {
+    curl_easy_setopt(rbce->curl, CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) NUM2LL(val));
+    } break;
+#endif
+#if HAVE_CURLOPT_MAX_RECV_SPEED_LARGE
+  case CURLOPT_MAX_RECV_SPEED_LARGE: {
+    curl_easy_setopt(rbce->curl, CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) NUM2LL(val));
+    } break;
+#endif
+#if HAVE_CURLOPT_MAXFILESIZE
+  case CURLOPT_MAXFILESIZE:
+    curl_easy_setopt(rbce->curl, CURLOPT_MAXFILESIZE, NUM2LONG(val));
+    break;
+#endif
+#if HAVE_CURLOPT_TCP_KEEPALIVE
+  case CURLOPT_TCP_KEEPALIVE:
+    curl_easy_setopt(rbce->curl, CURLOPT_TCP_KEEPALIVE, NUM2LONG(val));
+    break;
+  case CURLOPT_TCP_KEEPIDLE:
+    curl_easy_setopt(rbce->curl, CURLOPT_TCP_KEEPIDLE, NUM2LONG(val));
+    break;
+  case CURLOPT_TCP_KEEPINTVL:
+    curl_easy_setopt(rbce->curl, CURLOPT_TCP_KEEPINTVL, NUM2LONG(val));
+    break;
+#endif
+#if HAVE_CURLOPT_HAPROXYPROTOCOL
+  case CURLOPT_HAPROXYPROTOCOL:
+    curl_easy_setopt(rbce->curl, CURLOPT_HAPROXYPROTOCOL, NUM2LONG(val));
+    break;
+#endif
+  case CURLOPT_STDERR:
+    // libcurl requires raw FILE pointer and this should be IO object in Ruby.
+    // Tempfile or StringIO won't work.
+    Check_Type(val, T_FILE);
+    GetOpenFile(val, open_f_ptr);
+    curl_easy_setopt(rbce->curl, CURLOPT_STDERR, rb_io_stdio_file(open_f_ptr));
+    break;
+  case CURLOPT_PROTOCOLS:
+  case CURLOPT_REDIR_PROTOCOLS:
+    curl_easy_setopt(rbce->curl, option, NUM2LONG(val));
+    break;
+#if HAVE_CURLOPT_SSL_SESSIONID_CACHE
+  case CURLOPT_SSL_SESSIONID_CACHE:
+    curl_easy_setopt(rbce->curl, CURLOPT_SSL_SESSIONID_CACHE, NUM2LONG(val));
+    break;
+#endif
+  default:
+    rb_raise(rb_eTypeError, "Curb unsupported option");
+  }
+
+  return val;
+}
+
+/*
+ * call-seq:
+ *   easy.getinfo Fixnum => value
+ *
+ * Iniital access to libcurl curl_easy_getinfo, remember getinfo doesn't return the same values as setopt
+ */
+static VALUE ruby_curl_easy_get_opt(VALUE self, VALUE opt) {
+  return Qnil;
+}
+
 /*
  * call-seq:
  *   easy.inspect                                     => "#<Curl::Easy http://google.com/>"
@@ -3113,7 +3678,7 @@ static VALUE ruby_curl_easy_inspect(VALUE self) {
     size_t len = 13+((RSTRING_LEN(url) > 50) ? 50 : RSTRING_LEN(url));
     /* "#<Net::HTTP http://www.google.com/:80 open=false>" */
     memcpy(buf,"#<Curl::Easy ", 13);
-    memcpy(buf+13,RSTRING_PTR(url), (len - 13));
+    memcpy(buf+13,StringValueCStr(url), (len - 13));
     buf[len++] = '>';
     return rb_str_new(buf,len);
   }
@@ -3174,7 +3739,7 @@ static VALUE ruby_curl_easy_unescape(VALUE self, VALUE str) {
 #if (LIBCURL_VERSION_NUM >= 0x070f04)
   result = (char*)curl_easy_unescape(rbce->curl, StringValuePtr(str), (int)RSTRING_LEN(str), &rlen);
 #else
-  result = (char*)curl_unescape(StringValuePtr(str), RSTRING_LEN(str));
+  result = (char*)curl_unescape(StringValuePtr(str), (int)RSTRING_LEN(str));
   rlen = strlen(result);
 #endif
 
@@ -3189,114 +3754,14 @@ static VALUE ruby_curl_easy_unescape(VALUE self, VALUE str) {
 
 /*
  * call-seq:
- *   Curl::Easy.perform(url) { |easy| ... }           => #&lt;Curl::Easy...&gt;
- *
- * Convenience method that creates a new Curl::Easy instance with
- * the specified URL and calls the general +perform+ method, before returning
- * the new instance. For HTTP URLs, this is equivalent to calling +http_get+.
+ *   Curl::Easy.error(code)    => [ErrCode, String]
  *
- * If a block is supplied, the new instance will be yielded just prior to
- * the +http_get+ call.
+ * translate an internal libcurl error to ruby error class
  */
-static VALUE ruby_curl_easy_class_perform(int argc, VALUE *argv, VALUE klass) {
-  VALUE c = ruby_curl_easy_new(argc, argv, klass);
-
-  if (rb_block_given_p()) {
-    rb_yield(c);
-  }
-
-  ruby_curl_easy_perform(c);
-  return c;
+static VALUE ruby_curl_easy_error_message(VALUE klass, VALUE code) {
+  return rb_curl_easy_error(NUM2INT(code));
 }
 
-/*
- * call-seq:
- *   Curl::Easy.http_get(url) { |easy| ... }          => #&lt;Curl::Easy...&gt;
- *
- * Convenience method that creates a new Curl::Easy instance with
- * the specified URL and calls +http_get+, before returning the new instance.
- *
- * If a block is supplied, the new instance will be yielded just prior to
- * the +http_get+ call.
- */
-static VALUE ruby_curl_easy_class_perform_get(int argc, VALUE *argv, VALUE klass) {
-  VALUE c = ruby_curl_easy_new(argc, argv, klass);
-
-  ruby_curl_easy_perform_get(c);
-  return c;
-}
-
-/*
- * call-seq:
- *   Curl::Easy.http_delete(url) { |easy| ... }       => #&lt;Curl::Easy...&gt;
- *
- * Convenience method that creates a new Curl::Easy instance with
- * the specified URL and calls +http_delete+, before returning the new instance.
- *
- * If a block is supplied, the new instance will be yielded just prior to
- * the +http_delete+ call.
- */
-static VALUE ruby_curl_easy_class_perform_delete(int argc, VALUE *argv, VALUE klass) {
-  VALUE c = ruby_curl_easy_new(argc, argv, klass);
-
-  ruby_curl_easy_perform_delete(c);
-  return c;
-}
-
-/*
- * call-seq:
- *   Curl::Easy.http_head(url) { |easy| ... }         => #&lt;Curl::Easy...&gt;
- *
- * Convenience method that creates a new Curl::Easy instance with
- * the specified URL and calls +http_head+, before returning the new instance.
- *
- * If a block is supplied, the new instance will be yielded just prior to
- * the +http_head+ call.
- */
-static VALUE ruby_curl_easy_class_perform_head(int argc, VALUE *argv, VALUE klass) {
-  VALUE c = ruby_curl_easy_new(argc, argv, klass);
-
-  ruby_curl_easy_perform_head(c);
-
-  return c;
-}
-
-// TODO: add convenience method for http_post
-
-/*
- * call-seq:
- *   Curl::Easy.http_post(url, "some=urlencoded%20form%20data&and=so%20on") => true
- *   Curl::Easy.http_post(url, "some=urlencoded%20form%20data", "and=so%20on", ...) => true
- *   Curl::Easy.http_post(url, "some=urlencoded%20form%20data", Curl::PostField, "and=so%20on", ...) => true
- *   Curl::Easy.http_post(url, Curl::PostField, Curl::PostField ..., Curl::PostField) => true
- *
- * POST the specified formdata to the currently configured URL using
- * the current options set for this Curl::Easy instance. This method
- * always returns true, or raises an exception (defined under
- * Curl::Err) on error.
- *
- * If you wish to use multipart form encoding, you'll need to supply a block
- * in order to set multipart_form_post true. See #http_post for more
- * information.
- */
-static VALUE ruby_curl_easy_class_perform_post(int argc, VALUE *argv, VALUE klass) {
-  VALUE url, fields;
-  VALUE c;
-
-  rb_scan_args(argc, argv, "1*", &url, &fields);
-
-  c = ruby_curl_easy_new(1, &url, klass);
-
-  if (argc > 1) {
-    ruby_curl_easy_perform_post(argc - 1, &argv[1], c);
-  } else {
-    ruby_curl_easy_perform_post(0, NULL, c);
-  }
-
-  return c;
-}
-
-
 /* =================== INIT LIB =====================*/
 void init_curb_easy() {
   idCall = rb_intern("call");
@@ -3308,32 +3773,26 @@ void init_curb_easy() {
   cCurlEasy = rb_define_class_under(mCurl, "Easy", rb_cObject);
 
   /* Class methods */
-  rb_define_singleton_method(cCurlEasy, "new", ruby_curl_easy_new, -1);
-  rb_define_singleton_method(cCurlEasy, "perform", ruby_curl_easy_class_perform, -1);
-  rb_define_singleton_method(cCurlEasy, "http_delete", ruby_curl_easy_class_perform_delete, -1);
-  rb_define_singleton_method(cCurlEasy, "http_get", ruby_curl_easy_class_perform_get, -1);
-  rb_define_singleton_method(cCurlEasy, "http_post", ruby_curl_easy_class_perform_post, -1);
-  rb_define_singleton_method(cCurlEasy, "http_head", ruby_curl_easy_class_perform_head, -1);
-  rb_define_singleton_method(cCurlEasy, "http_put", ruby_curl_easy_class_perform_put, 2);
+  rb_define_alloc_func(cCurlEasy, ruby_curl_easy_allocate);
+  rb_define_singleton_method(cCurlEasy, "error", ruby_curl_easy_error_message, 1);
+
+  /* Initialize method */
+  rb_define_method(cCurlEasy, "initialize", ruby_curl_easy_initialize, -1);
 
   /* Attributes for config next perform */
-  rb_define_method(cCurlEasy, "url=", ruby_curl_easy_url_set, 1);
   rb_define_method(cCurlEasy, "url", ruby_curl_easy_url_get, 0);
-  rb_define_method(cCurlEasy, "proxy_url=", ruby_curl_easy_proxy_url_set, 1);
   rb_define_method(cCurlEasy, "proxy_url", ruby_curl_easy_proxy_url_get, 0);
+
+  rb_define_method(cCurlEasy, "proxy_headers=", ruby_curl_easy_proxy_headers_set, 1);
+  rb_define_method(cCurlEasy, "proxy_headers", ruby_curl_easy_proxy_headers_get, 0);
+
   rb_define_method(cCurlEasy, "headers=", ruby_curl_easy_headers_set, 1);
   rb_define_method(cCurlEasy, "headers", ruby_curl_easy_headers_get, 0);
-  rb_define_method(cCurlEasy, "interface=", ruby_curl_easy_interface_set, 1);
   rb_define_method(cCurlEasy, "interface", ruby_curl_easy_interface_get, 0);
-  rb_define_method(cCurlEasy, "userpwd=", ruby_curl_easy_userpwd_set, 1);
   rb_define_method(cCurlEasy, "userpwd", ruby_curl_easy_userpwd_get, 0);
-  rb_define_method(cCurlEasy, "proxypwd=", ruby_curl_easy_proxypwd_set, 1);
   rb_define_method(cCurlEasy, "proxypwd", ruby_curl_easy_proxypwd_get, 0);
-  rb_define_method(cCurlEasy, "cookies=", ruby_curl_easy_cookies_set, 1);
   rb_define_method(cCurlEasy, "cookies", ruby_curl_easy_cookies_get, 0);
-  rb_define_method(cCurlEasy, "cookiefile=", ruby_curl_easy_cookiefile_set, 1);
   rb_define_method(cCurlEasy, "cookiefile", ruby_curl_easy_cookiefile_get, 0);
-  rb_define_method(cCurlEasy, "cookiejar=", ruby_curl_easy_cookiejar_set, 1);
   rb_define_method(cCurlEasy, "cookiejar", ruby_curl_easy_cookiejar_get, 0);
   rb_define_method(cCurlEasy, "cert=", ruby_curl_easy_cert_set, 1);
   rb_define_method(cCurlEasy, "cert", ruby_curl_easy_cert_get, 0);
@@ -3353,6 +3812,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "put_data=", ruby_curl_easy_put_data_set, 1);
   rb_define_method(cCurlEasy, "ftp_commands=", ruby_curl_easy_ftp_commands_set, 1);
   rb_define_method(cCurlEasy, "ftp_commands", ruby_curl_easy_ftp_commands_get, 0);
+  rb_define_method(cCurlEasy, "resolve=", ruby_curl_easy_resolve_set, 1);
+  rb_define_method(cCurlEasy, "resolve", ruby_curl_easy_resolve_get, 0);
 
   rb_define_method(cCurlEasy, "local_port=", ruby_curl_easy_local_port_set, 1);
   rb_define_method(cCurlEasy, "local_port", ruby_curl_easy_local_port_get, 0);
@@ -3370,8 +3831,12 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "max_redirects", ruby_curl_easy_max_redirects_get, 0);
   rb_define_method(cCurlEasy, "timeout=", ruby_curl_easy_timeout_set, 1);
   rb_define_method(cCurlEasy, "timeout", ruby_curl_easy_timeout_get, 0);
+  rb_define_method(cCurlEasy, "timeout_ms=", ruby_curl_easy_timeout_ms_set, 1);
+  rb_define_method(cCurlEasy, "timeout_ms", ruby_curl_easy_timeout_ms_get, 0);
   rb_define_method(cCurlEasy, "connect_timeout=", ruby_curl_easy_connect_timeout_set, 1);
   rb_define_method(cCurlEasy, "connect_timeout", ruby_curl_easy_connect_timeout_get, 0);
+  rb_define_method(cCurlEasy, "connect_timeout_ms=", ruby_curl_easy_connect_timeout_ms_set, 1);
+  rb_define_method(cCurlEasy, "connect_timeout_ms", ruby_curl_easy_connect_timeout_ms_get, 0);
   rb_define_method(cCurlEasy, "dns_cache_timeout=", ruby_curl_easy_dns_cache_timeout_set, 1);
   rb_define_method(cCurlEasy, "dns_cache_timeout", ruby_curl_easy_dns_cache_timeout_get, 0);
   rb_define_method(cCurlEasy, "ftp_response_timeout=", ruby_curl_easy_ftp_response_timeout_set, 1);
@@ -3380,6 +3845,10 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "low_speed_limit", ruby_curl_easy_low_speed_limit_get, 0);
   rb_define_method(cCurlEasy, "low_speed_time=", ruby_curl_easy_low_speed_time_set, 1);
   rb_define_method(cCurlEasy, "low_speed_time", ruby_curl_easy_low_speed_time_get, 0);
+  rb_define_method(cCurlEasy, "max_send_speed_large=", ruby_curl_easy_max_send_speed_large_set, 1);
+  rb_define_method(cCurlEasy, "max_send_speed_large", ruby_curl_easy_max_send_speed_large_get, 0);
+  rb_define_method(cCurlEasy, "max_recv_speed_large=", ruby_curl_easy_max_recv_speed_large_set, 1);
+  rb_define_method(cCurlEasy, "max_recv_speed_large", ruby_curl_easy_max_recv_speed_large_get, 0);
   rb_define_method(cCurlEasy, "ssl_version=", ruby_curl_easy_ssl_version_set, 1);
   rb_define_method(cCurlEasy, "ssl_version", ruby_curl_easy_ssl_version_get, 0);
   rb_define_method(cCurlEasy, "use_ssl=", ruby_curl_easy_use_ssl_set, 1);
@@ -3398,13 +3867,12 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "fetch_file_time?", ruby_curl_easy_fetch_file_time_q, 0);
   rb_define_method(cCurlEasy, "ssl_verify_peer=", ruby_curl_easy_ssl_verify_peer_set, 1);
   rb_define_method(cCurlEasy, "ssl_verify_peer?", ruby_curl_easy_ssl_verify_peer_q, 0);
-  rb_define_method(cCurlEasy, "ssl_verify_host=", ruby_curl_easy_ssl_verify_host_set, 1);
-  rb_define_method(cCurlEasy, "ssl_verify_host?", ruby_curl_easy_ssl_verify_host_q, 0);
+  rb_define_method(cCurlEasy, "ssl_verify_host_integer=", ruby_curl_easy_ssl_verify_host_set, 1);
+  rb_define_method(cCurlEasy, "ssl_verify_host", ruby_curl_easy_ssl_verify_host_get, 0);
   rb_define_method(cCurlEasy, "header_in_body=", ruby_curl_easy_header_in_body_set, 1);
   rb_define_method(cCurlEasy, "header_in_body?", ruby_curl_easy_header_in_body_q, 0);
   rb_define_method(cCurlEasy, "use_netrc=", ruby_curl_easy_use_netrc_set, 1);
   rb_define_method(cCurlEasy, "use_netrc?", ruby_curl_easy_use_netrc_q, 0);
-  rb_define_method(cCurlEasy, "follow_location=", ruby_curl_easy_follow_location_set, 1);
   rb_define_method(cCurlEasy, "follow_location?", ruby_curl_easy_follow_location_q, 0);
   rb_define_method(cCurlEasy, "autoreferer=", ruby_curl_easy_autoreferer_set, 1);
   rb_define_method(cCurlEasy, "unrestricted_auth=", ruby_curl_easy_unrestricted_auth_set, 1);
@@ -3417,6 +3885,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "enable_cookies?", ruby_curl_easy_enable_cookies_q, 0);
   rb_define_method(cCurlEasy, "ignore_content_length=", ruby_curl_easy_ignore_content_length_set, 1);
   rb_define_method(cCurlEasy, "ignore_content_length?", ruby_curl_easy_ignore_content_length_q, 0);
+  rb_define_method(cCurlEasy, "resolve_mode", ruby_curl_easy_resolve_mode, 0);
+  rb_define_method(cCurlEasy, "resolve_mode=", ruby_curl_easy_resolve_mode_set, 1);
 
   rb_define_method(cCurlEasy, "on_body", ruby_curl_easy_on_body_set, -1);
   rb_define_method(cCurlEasy, "on_header", ruby_curl_easy_on_header_set, -1);
@@ -3424,22 +3894,13 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "on_debug", ruby_curl_easy_on_debug_set, -1);
   rb_define_method(cCurlEasy, "on_success", ruby_curl_easy_on_success_set, -1);
   rb_define_method(cCurlEasy, "on_failure", ruby_curl_easy_on_failure_set, -1);
+  rb_define_method(cCurlEasy, "on_missing", ruby_curl_easy_on_missing_set, -1);
+  rb_define_method(cCurlEasy, "on_redirect", ruby_curl_easy_on_redirect_set, -1);
   rb_define_method(cCurlEasy, "on_complete", ruby_curl_easy_on_complete_set, -1);
 
-  rb_define_method(cCurlEasy, "perform", ruby_curl_easy_perform, 0);
   rb_define_method(cCurlEasy, "http", ruby_curl_easy_perform_verb, 1);
-  rb_define_method(cCurlEasy, "http_delete", ruby_curl_easy_perform_delete, 0);
-  rb_define_method(cCurlEasy, "http_get", ruby_curl_easy_perform_get, 0);
   rb_define_method(cCurlEasy, "http_post", ruby_curl_easy_perform_post, -1);
-  rb_define_method(cCurlEasy, "http_head", ruby_curl_easy_perform_head, 0);
   rb_define_method(cCurlEasy, "http_put", ruby_curl_easy_perform_put, 1);
-  rb_define_method(cCurlEasy, "head=", ruby_curl_easy_set_head_option, 1);
-  rb_define_method(cCurlEasy, "delete=", ruby_curl_easy_set_delete_option, 1);
-  rb_define_method(cCurlEasy, "version=", ruby_curl_easy_set_version, 1);
-  rb_define_const(mCurl, "HTTP_1_1", LONG2NUM(CURL_HTTP_VERSION_1_1));
-  rb_define_const(mCurl, "HTTP_1_0", LONG2NUM(CURL_HTTP_VERSION_1_0));
-  rb_define_const(mCurl, "HTTP_NONE", LONG2NUM(CURL_HTTP_VERSION_NONE));
-  rb_define_method(cCurlEasy, "nosignal=", ruby_curl_easy_set_nosignal, 1);
 
   /* Post-perform info methods */
   rb_define_method(cCurlEasy, "body_str", ruby_curl_easy_body_str_get, 0);
@@ -3455,10 +3916,14 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "total_time", ruby_curl_easy_total_time_get, 0);
   rb_define_method(cCurlEasy, "name_lookup_time", ruby_curl_easy_name_lookup_time_get, 0);
   rb_define_method(cCurlEasy, "connect_time", ruby_curl_easy_connect_time_get, 0);
+#if defined(HAVE_CURLINFO_APPCONNECT_TIME)
+  rb_define_method(cCurlEasy, "app_connect_time", ruby_curl_easy_app_connect_time_get, 0);
+#endif
   rb_define_method(cCurlEasy, "pre_transfer_time", ruby_curl_easy_pre_transfer_time_get, 0);
   rb_define_method(cCurlEasy, "start_transfer_time", ruby_curl_easy_start_transfer_time_get, 0);
   rb_define_method(cCurlEasy, "redirect_time", ruby_curl_easy_redirect_time_get, 0);
   rb_define_method(cCurlEasy, "redirect_count", ruby_curl_easy_redirect_count_get, 0);
+  rb_define_method(cCurlEasy, "redirect_url", ruby_curl_easy_redirect_url_get, 0);
   rb_define_method(cCurlEasy, "downloaded_bytes", ruby_curl_easy_downloaded_bytes_get, 0);
   rb_define_method(cCurlEasy, "uploaded_bytes", ruby_curl_easy_uploaded_bytes_get, 0);
   rb_define_method(cCurlEasy, "download_speed", ruby_curl_easy_download_speed_get, 0);
@@ -3471,6 +3936,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "content_type", ruby_curl_easy_content_type_get, 0);
   rb_define_method(cCurlEasy, "os_errno", ruby_curl_easy_os_errno_get, 0);
   rb_define_method(cCurlEasy, "num_connects", ruby_curl_easy_num_connects_get, 0);
+  rb_define_method(cCurlEasy, "cookielist", ruby_curl_easy_cookielist_get, 0);
   rb_define_method(cCurlEasy, "ftp_entry_path", ruby_curl_easy_ftp_entry_path_get, 0);
 
   rb_define_method(cCurlEasy, "close", ruby_curl_easy_close, 0);
@@ -3484,4 +3950,12 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "clone", ruby_curl_easy_clone, 0);
   rb_define_alias(cCurlEasy, "dup", "clone");
   rb_define_method(cCurlEasy, "inspect", ruby_curl_easy_inspect, 0);
+
+  rb_define_method(cCurlEasy, "multi", ruby_curl_easy_multi_get, 0);
+  rb_define_method(cCurlEasy, "multi=", ruby_curl_easy_multi_set, 1);
+  rb_define_method(cCurlEasy, "last_result", ruby_curl_easy_last_result, 0);
+  rb_define_method(cCurlEasy, "last_error", ruby_curl_easy_last_error, 0);
+
+  rb_define_method(cCurlEasy, "setopt", ruby_curl_easy_set_opt, 2);
+  rb_define_method(cCurlEasy, "getinfo", ruby_curl_easy_get_opt, 1);
 }