curb 0.7.15 → 0.7.18

data/ext/curb_easy.c

@@ -28,6 +28,10 @@ VALUE cCurlEasy;
 
 /* ================== 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,
@@ -111,27 +115,56 @@ static size_t proc_data_handler(char *stream,
   }
 }
 
+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);
+
+  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));
 
-  procret = rb_funcall(proc, idCall, 4, rb_float_new(dltotal),
-                                        rb_float_new(dlnow),
-                                        rb_float_new(ultotal),
-                                        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), // INT2FIX(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 procret;
+  VALUE callargs = rb_ary_new2(3);
+  rb_ary_store(callargs, 0, proc);
+  rb_ary_store(callargs, 1, INT2FIX(type));
+  rb_ary_store(callargs, 2, rb_str_new(data, data_len));
+  rb_rescue(call_debug_handler, callargs, callback_exception, Qnil);
+  // XXX: 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, INT2FIX(type), rb_str_new(data, data_len));
   return 0;
 }
 
@@ -191,7 +224,7 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   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;
@@ -347,18 +380,6 @@ static VALUE ruby_curl_easy_reset(VALUE self) {
 
 /* ================ 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 +390,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
@@ -449,17 +441,6 @@ static VALUE ruby_curl_easy_headers_get(VALUE self) {
   return headers;
 }
 
-/*
- * call-seq:
- *   easy.interface = string                          => string
- *
- * 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.
- */
-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
@@ -471,17 +452,6 @@ static VALUE ruby_curl_easy_interface_get(VALUE self) {
   CURB_OBJECT_HGETTER(ruby_curl_easy, interface_hm);
 }
 
-/*
- * call-seq:
- *   easy.userpwd = string                            => string
- *
- * Set the username/password string to use for subsequent calls to +perform+.
- * The supplied string should have the form "username:password"
- */
-static VALUE ruby_curl_easy_userpwd_set(VALUE self, VALUE userpwd) {
-  CURB_OBJECT_HSETTER(ruby_curl_easy, userpwd);
-}
-
 /*
  * call-seq:
  *   easy.userpwd                                     => string
@@ -493,18 +463,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 +475,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 +485,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 +495,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
@@ -1453,7 +1371,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 +1383,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);
 }
 
 /*
@@ -1685,6 +1603,65 @@ 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;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  unsigned short rm = rbce->resolve_mode;
+
+  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.resolve_mode = symbol                             => symbol
+ *
+ * Configures what type of IP address this Curl::Easy instance
+ * resolves DNS names to. Valid options are:
+ *
+ * [: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;
+    Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+    ID 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 ================== */
@@ -1816,7 +1793,10 @@ 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;
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
   VALUE header_str = Qnil;
 
   //rb_p(header);
@@ -1845,7 +1825,10 @@ static VALUE cb_each_http_header(VALUE header, struct curl_slist **list) {
 /***********************************************
  * 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) {
+static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
+  struct curl_slist **list;
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
   VALUE ftp_command_string = rb_obj_as_string(ftp_command);
   *list = curl_slist_append(*list, StringValuePtr(ftp_command));
 
@@ -1976,12 +1959,12 @@ 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);
@@ -1992,6 +1975,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   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);
@@ -2077,7 +2062,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 +2073,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) {
@@ -2122,7 +2111,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));
@@ -2136,7 +2126,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   /* 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) {
@@ -2181,35 +2172,6 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
   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
@@ -2228,7 +2190,7 @@ static VALUE ruby_curl_easy_perform_get(VALUE self) {
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
 
-  return handle_perform(self,rbce);
+  return rb_funcall(self, rb_intern("perform"), 0);
 }
 
 /*
@@ -2244,7 +2206,7 @@ static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
 
   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);
 
@@ -2273,33 +2235,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
@@ -2353,7 +2299,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,7 +2321,7 @@ 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);
     }
   }
 }
@@ -2400,7 +2346,7 @@ static VALUE ruby_curl_easy_perform_head(VALUE self) {
 
   curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
 
-  ret = handle_perform(self,rbce);
+  ret = rb_funcall(self, rb_intern("perform"), 0);
 
   curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
   return ret;
@@ -2427,62 +2373,6 @@ static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
 
   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
@@ -2501,20 +2391,9 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
   
-  return handle_perform(self, rbce);
+  return rb_funcall(self, rb_intern("perform"), 0);
 }
 
-/*
- * 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;
-}
 
 /* =================== DATA FUNCS =============== */
 
@@ -2923,7 +2802,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)
 */
 
 /*
@@ -3099,6 +2981,119 @@ 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 INT2FIX(rbce->last_result);
+}
+
+/*
+ * call-seq:
+ *   easy.setopt Fixnum, value  => value
+ *
+ * Iniital 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 = FIX2LONG(opt);
+
+  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_HEADER:
+  case CURLOPT_NOPROGRESS:
+  case CURLOPT_NOSIGNAL:
+    curl_easy_setopt(rbce->curl, CURLOPT_NOSIGNAL, val == Qtrue ? 1 : 0);
+    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, FIX2INT(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_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;
+
+  default:
+    break;
+  }
+
+  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 +3108,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);
   }
@@ -3189,114 +3184,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+.
- *
- * 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(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;
-}
-
-/*
- * 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.
+ *   Curl::Easy.error(code)    => String
  *
- * If a block is supplied, the new instance will be yielded just prior to
- * the +http_head+ call.
+ * translate an internal libcurl error to ruby error class
  */
-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;
+static VALUE ruby_curl_easy_error_message(VALUE klass, VALUE code) {
+  return rb_curl_easy_error(FIX2INT(code));
 }
 
-// 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");
@@ -3309,31 +3204,18 @@ void init_curb_easy() {
 
   /* 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_singleton_method(cCurlEasy, "error", ruby_curl_easy_error_message, 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, "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);
@@ -3398,8 +3280,8 @@ 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);
@@ -3417,6 +3299,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);
@@ -3426,7 +3310,6 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "on_failure", ruby_curl_easy_on_failure_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);
@@ -3434,12 +3317,6 @@ void init_curb_easy() {
   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);
@@ -3484,4 +3361,11 @@ 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, "setopt", ruby_curl_easy_set_opt, 2);
+  rb_define_method(cCurlEasy, "getinfo", ruby_curl_easy_get_opt, 1);
 }