ghazel-curb 0.6.2.3 → 0.7.9.1

data/ext/curb_easy.c

@@ -26,21 +26,6 @@ static VALUE rbstrAmp;
 VALUE cCurlEasy;
 
 
-/* XXX: This is copy/pasted from ruby 1.8.7 for compatibility with ruby 1.8.6 */
-
-VALUE
-rb_hash_lookup_187(hash, key)
-    VALUE hash, key;
-{
-    VALUE val;
-
-    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
-        return Qnil; /* without Hash#default */
-    }
-    return val;
-}
-
-
 /* ================== CURL HANDLER FUNCS ==============*/
 
 /* These handle both body and header data */
@@ -72,7 +57,7 @@ static size_t read_data_handler(void *ptr,
       return 0;
     }
   }
-  else {
+  else if (rb_respond_to(stream, rb_intern("to_s"))) {
     ruby_curl_upload *rbcu;
     VALUE str;
     size_t len;
@@ -83,6 +68,7 @@ static size_t read_data_handler(void *ptr,
     len = RSTRING_LEN(str);
     remaining = len - rbcu->offset;
     str_ptr = RSTRING_PTR(str);
+
     if( remaining < read_bytes ) {
       if( remaining > 0 ) {
         memcpy(ptr, str_ptr+rbcu->offset, remaining);
@@ -101,7 +87,9 @@ static size_t read_data_handler(void *ptr,
     }
     return read_bytes;
   }
-
+  else {
+    return 0;
+  }
 }
 
 static size_t proc_data_handler(char *stream,
@@ -149,88 +137,37 @@ static int proc_debug_handler(CURL *curl,
 
 /* ================== MARK/FREE FUNC ==================*/
 void curl_easy_mark(ruby_curl_easy *rbce) {
-#if 0
-  rb_gc_mark(rbce->url);
-  rb_gc_mark(rbce->proxy_url);
-  rb_gc_mark(rbce->body_proc);
-  rb_gc_mark(rbce->body_data);
-  rb_gc_mark(rbce->header_proc);
-  rb_gc_mark(rbce->header_data);
-  rb_gc_mark(rbce->progress_proc);
-  rb_gc_mark(rbce->debug_proc);
-  rb_gc_mark(rbce->interface_hm);
-  rb_gc_mark(rbce->userpwd);
-#if HAVE_CURLOPT_USERNAME
-  rb_gc_mark(rbce->username);
-#endif
-#if HAVE_CURLOPT_PASSWORD
-  rb_gc_mark(rbce->password);
-#endif
-  rb_gc_mark(rbce->proxypwd);
-  rb_gc_mark(rbce->headers);
-  rb_gc_mark(rbce->cookies);
-  rb_gc_mark(rbce->cookiefile);
-  rb_gc_mark(rbce->cookiejar);
-  rb_gc_mark(rbce->cert);
-  rb_gc_mark(rbce->cacert);
-  rb_gc_mark(rbce->certpassword);
-  rb_gc_mark(rbce->certtype);
-  rb_gc_mark(rbce->encoding);
-  rb_gc_mark(rbce->useragent);
-  rb_gc_mark(rbce->success_proc);
-  rb_gc_mark(rbce->failure_proc);
-  rb_gc_mark(rbce->complete_proc);
-
-  rb_gc_mark(rbce->postdata_buffer);
-  rb_gc_mark(rbce->bodybuf);
-  rb_gc_mark(rbce->headerbuf);
-
-  if( rbce->upload != Qnil ) {
-    rb_gc_mark(rbce->upload);
-  }
-#endif
-  rb_gc_mark(rbce->opts);
+  if (!NIL_P(rbce->opts)) { rb_gc_mark(rbce->opts); }
+  if (!NIL_P(rbce->multi)) { rb_gc_mark(rbce->multi); }
 }
 
-void curl_easy_free(ruby_curl_easy *rbce) {
+static void ruby_curl_easy_free(ruby_curl_easy *rbce) {
   if (rbce->curl_headers) {
     curl_slist_free_all(rbce->curl_headers);
   }
-  curl_easy_cleanup(rbce->curl);
-  free(rbce);
-}
 
+  if (rbce->curl_ftp_commands) {
+    curl_slist_free_all(rbce->curl_ftp_commands);
+  }
 
-/* ================= ALLOC METHODS ====================*/
-
-/*
- * call-seq:
- *   Curl::Easy.new                                   => #&lt;Curl::Easy...&gt;
- *   Curl::Easy.new(url = nil)                        => #&lt;Curl::Easy...&gt;
- *   Curl::Easy.new(url = nil) { |self| ... }         => #&lt;Curl::Easy...&gt;
- *
- * Create 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) {
-  CURLcode ecode;
-  VALUE url, blk;
-  VALUE new_curl;
-  ruby_curl_easy *rbce;
+  if (rbce->curl) {
+    curl_easy_cleanup(rbce->curl);
+  }
+}
 
-  rb_scan_args(argc, argv, "01&", &url, &blk);
+void curl_easy_free(ruby_curl_easy *rbce) {
+  ruby_curl_easy_free(rbce);
+  free(rbce);
+}
 
-  rbce = ALLOC(ruby_curl_easy);
 
-  /* handler */
-  rbce->curl = curl_easy_init();
+/* ================= ALLOC METHODS ====================*/
 
+static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->opts = rb_hash_new();
 
-  rb_easy_set("url", url);
-
   rbce->curl_headers = NULL;
+  rbce->curl_ftp_commands = NULL;
 
   /* various-typed opts */
   rbce->local_port = 0;
@@ -244,6 +181,11 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->connect_timeout = 0;
   rbce->dns_cache_timeout = 60;
   rbce->ftp_response_timeout = 0;
+  rbce->low_speed_limit = 0;
+  rbce->low_speed_time = 0;
+  rbce->ssl_version = -1;
+  rbce->use_ssl = -1;
+  rbce->ftp_filemethod = -1;
 
   /* bool opts */
   rbce->proxy_tunnel = 0;
@@ -257,9 +199,44 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->verbose = 0;
   rbce->multipart_form_post = 0;
   rbce->enable_cookies = 0;
+  rbce->ignore_content_length = 0;
+}
+
+/*
+ * call-seq:
+ *   Curl::Easy.new                                   => #&lt;Curl::Easy...&gt;
+ *   Curl::Easy.new(url = nil)                        => #&lt;Curl::Easy...&gt;
+ *   Curl::Easy.new(url = nil) { |self| ... }         => #&lt;Curl::Easy...&gt;
+ *
+ * Create 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) {
+  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);
+
+  /* handler */
+  rbce->curl = curl_easy_init();
+  if (!rbce->curl) {
+    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);
+
+  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);
   if (ecode != CURLE_OK) {
@@ -290,10 +267,83 @@ 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_ftp_commands = NULL;
 
   return Data_Wrap_Struct(cCurlEasy, curl_easy_mark, curl_easy_free, newrbce);
 }
 
+/*
+ * call-seq:
+ *   easy.close                                      => nil
+ *
+ * Close the Curl::Easy instance. Any open connections are closed
+ * 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) {
+  CURLcode ecode;
+  ruby_curl_easy *rbce;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  ruby_curl_easy_free(rbce);
+
+  /* reinit the handle */
+  rbce->curl = curl_easy_init();
+  if (!rbce->curl) {
+    rb_raise(eCurlErrFailedInit, "Failed to initialize easy handle");
+  }
+
+  rbce->multi = Qnil;
+
+  ruby_curl_easy_zero(rbce);
+
+  /* give the new curl handle a reference back to the ruby object */
+  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)self);
+  if (ecode != CURLE_OK) {
+    raise_curl_easy_error_exception(ecode);
+  }
+
+  return Qnil;
+}
+
+/*
+ * call-seq:
+ *   easy.reset                                      => Hash
+ *
+ * Reset the Curl::Easy instance, clears out all settings.
+ *
+ * from http://curl.haxx.se/libcurl/c/curl_easy_reset.html
+ * Re-initializes all options previously set on a specified CURL handle to the default values. This puts back the handle to the same state as it was in when it was just created with curl_easy_init(3).
+ * It does not change the following information kept in the handle: live connections, the Session ID cache, the DNS cache, the cookies and shares.
+ *
+ * The return value contains all settings stored.
+ */
+static VALUE ruby_curl_easy_reset(VALUE self) {
+  CURLcode ecode;
+  ruby_curl_easy *rbce;
+  VALUE opts_dup;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  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 */
+  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)self);
+  if (ecode != CURLE_OK) {
+    raise_curl_easy_error_exception(ecode);
+  }
+
+  /* Free everything up */
+  if (rbce->curl_headers) {
+    curl_slist_free_all(rbce->curl_headers);
+    rbce->curl_headers = NULL;
+  }
+
+  return opts_dup;
+}
+
 
 /* ================ OBJ ATTRIBUTES ==================*/
 
@@ -311,7 +361,7 @@ static VALUE ruby_curl_easy_url_set(VALUE self, VALUE url) {
 
 /*
  * call-seq:
- *   easy.url                                         => "http://some.url/"
+ *   easy.url                                         => string
  *
  * Obtain the URL that will be used by subsequent calls to +perform+.
  */
@@ -321,7 +371,7 @@ static VALUE ruby_curl_easy_url_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.proxy_url = "some.url"                      => "some.url"
+ *   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
@@ -350,7 +400,7 @@ static VALUE ruby_curl_easy_proxy_url_set(VALUE self, VALUE proxy_url) {
 
 /*
  * call-seq:
- *   easy.proxy_url                                   => "some.url"
+ *   easy.proxy_url                                   => string
  *
  * Obtain the HTTP Proxy URL that will be used by subsequent calls to +perform+.
  */
@@ -360,8 +410,8 @@ static VALUE ruby_curl_easy_proxy_url_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.headers = "Header: val"                              => ["Header: val", ...]
- *   easy.headers = {"Header" => "val" ..., "Header" => "val"} => ["Header: val", ...]
+ *   easy.headers = "Header: val"                              => "Header: val"
+ *   easy.headers = {"Header" => "val" ..., "Header" => "val"} => {"Header: val", ...}
  *   easy.headers = ["Header: val" ..., "Header: val"]         => ["Header: val", ...]
  *
  * Set custom HTTP headers for following requests. This can be used to add
@@ -375,7 +425,7 @@ static VALUE ruby_curl_easy_proxy_url_get(VALUE self) {
  * To remove a standard header (this is useful when removing libcurls default
  * 'Expect: 100-Continue' header when using HTTP form posts):
  *
- *    easy.headers["Expect:"] = ''
+ *    easy.headers["Expect"] = ''
  *
  * Anything passed to libcurl as a header will be converted to a string during
  * the perform step.
@@ -386,7 +436,7 @@ static VALUE ruby_curl_easy_headers_set(VALUE self, VALUE headers) {
 
 /*
  * call-seq:
- *   easy.headers                                              => Hash, Array or Str
+ *   easy.headers                                     => Hash, Array or Str
  *
  * Obtain the custom HTTP headers for following requests.
  */
@@ -401,7 +451,7 @@ static VALUE ruby_curl_easy_headers_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.interface = "interface"                     => "interface"
+ *   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.
@@ -412,7 +462,7 @@ static VALUE ruby_curl_easy_interface_set(VALUE self, VALUE interface_hm) {
 
 /*
  * call-seq:
- *   easy.interface                                   => "interface"
+ *   easy.interface                                   => string
  *
  * 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.
@@ -423,7 +473,7 @@ static VALUE ruby_curl_easy_interface_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.userpwd = "pwd string"                      => "pwd string"
+ *   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"
@@ -434,7 +484,7 @@ static VALUE ruby_curl_easy_userpwd_set(VALUE self, VALUE userpwd) {
 
 /*
  * call-seq:
- *   easy.userpwd                                     => "pwd string"
+ *   easy.userpwd                                     => string
  *
  * Obtain the username/password string that will be used for subsequent
  * calls to +perform+.
@@ -445,7 +495,7 @@ static VALUE ruby_curl_easy_userpwd_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.proxypwd = "pwd string"                     => "pwd string"
+ *   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
@@ -457,7 +507,7 @@ static VALUE ruby_curl_easy_proxypwd_set(VALUE self, VALUE proxypwd) {
 
 /*
  * call-seq:
- *   easy.proxypwd                                    => "pwd string"
+ *   easy.proxypwd                                    => string
  *
  * Obtain the username/password string that will be used for proxy
  * connection during subsequent calls to +perform+. The supplied string
@@ -470,7 +520,7 @@ static VALUE ruby_curl_easy_proxypwd_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.cookies = "name1=content1; name2=content2;"                => "pwd string"
+ *   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.
@@ -482,7 +532,7 @@ static VALUE ruby_curl_easy_cookies_set(VALUE self, VALUE cookies) {
 
 /*
  * call-seq:
- *   easy.cookies                                   => "name1=content1; name2=content2;"
+ *   easy.cookies                                     => "name1=content1; name2=content2;"
  *
  * Obtain the cookies for this Curl::Easy instance.
  */
@@ -492,7 +542,7 @@ static VALUE ruby_curl_easy_cookies_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.cookiefile = "cookies.txt"                => "pwd string"
+ *   easy.cookiefile = string                         => string
  *
  * Set a file that contains cookies to be sent in subsequent requests by this Curl::Easy instance.
  *
@@ -505,7 +555,7 @@ static VALUE ruby_curl_easy_cookiefile_set(VALUE self, VALUE cookiefile) {
 
 /*
  * call-seq:
- *   easy.cookiefile                                   => "cookies.txt"
+ *   easy.cookiefile                                  => string
  *
  * Obtain the cookiefile file for this Curl::Easy instance.
  */
@@ -515,7 +565,7 @@ static VALUE ruby_curl_easy_cookiefile_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.cookiejar = "cookiejar.file"                => "pwd string"
+ *   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.
@@ -529,7 +579,7 @@ static VALUE ruby_curl_easy_cookiejar_set(VALUE self, VALUE cookiejar) {
 
 /*
  * call-seq:
- *   easy.cookiejar                                   => "cookiejar.file"
+ *   easy.cookiejar                                   => string
  *
  * Obtain the cookiejar file to use for this Curl::Easy instance.
  */
@@ -539,7 +589,7 @@ static VALUE ruby_curl_easy_cookiejar_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.cert = "cert.file"                          => ""
+ *   easy.cert = string                               => ""
  *
  * Set a cert file to use for this Curl::Easy instance. This file
  * will be used to validate SSL connections.
@@ -551,7 +601,7 @@ static VALUE ruby_curl_easy_cert_set(VALUE self, VALUE cert) {
 
 /*
  * call-seq:
- *   easy.cert                                        => "cert.file"
+ *   easy.cert                                        => string
  *
  * Obtain the cert file to use for this Curl::Easy instance.
  */
@@ -561,7 +611,29 @@ static VALUE ruby_curl_easy_cert_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.cacert = "cacert.file"                      => ""
+ *   easy.cert_key = "cert_key.file"                  => ""
+ *
+ * Set a cert key to use for this Curl::Easy instance. This file
+ * will be used to validate SSL certificates.
+ *
+ */
+static VALUE ruby_curl_easy_cert_key_set(VALUE self, VALUE cert_key) {
+  CURB_OBJECT_HSETTER(ruby_curl_easy, cert_key);
+}
+
+/*
+ * call-seq:
+ *   easy.cert_key                                    => "cert_key.file"
+ *
+ * Obtain the cert key file to use for this Curl::Easy instance.
+ */
+static VALUE ruby_curl_easy_cert_key_get(VALUE self) {
+  CURB_OBJECT_HGETTER(ruby_curl_easy, cert_key);
+}
+
+/*
+ * call-seq:
+ *   easy.cacert = string                             => ""
  *
  * Set a cacert bundle to use for this Curl::Easy instance. This file
  * will be used to validate SSL certificates.
@@ -573,7 +645,7 @@ static VALUE ruby_curl_easy_cacert_set(VALUE self, VALUE cacert) {
 
 /*
  * call-seq:
- *   easy.cacert                                      => "cacert.file"
+ *   easy.cacert                                      => string
  *
  * Obtain the cacert file to use for this Curl::Easy instance.
  */
@@ -583,7 +655,7 @@ static VALUE ruby_curl_easy_cacert_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.certpassword = "cert password"                   => ""
+ *   easy.certpassword = string                       => ""
  *
  * Set a password used to open the specified cert
  */
@@ -605,7 +677,7 @@ static VALUE ruby_curl_easy_certtype_set(VALUE self, VALUE certtype) {
 
 /*
  * call-seq:
- *   easy.certtype                                  => "cert.type"
+ *   easy.certtype                                    => string
  *
  * Obtain the cert type used for this Curl::Easy instance
  */
@@ -615,7 +687,7 @@ static VALUE ruby_curl_easy_certtype_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.encoding=                                     => "string"
+ *   easy.encoding = string                           => string
  *
  * Set the accepted encoding types, curl will handle all of the decompression
  *
@@ -625,7 +697,7 @@ static VALUE ruby_curl_easy_encoding_set(VALUE self, VALUE encoding) {
 }
 /*
  * call-seq:
- *   easy.encoding                                     => "string"
+ *   easy.encoding                                    => string
  *
  * Get the set encoding types
  *
@@ -636,7 +708,7 @@ static VALUE ruby_curl_easy_encoding_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.useragent = "Ruby/Curb"                      => ""
+ *   easy.useragent = "Ruby/Curb"                     => ""
  *
  * Set the user agent string for this Curl::Easy instance
  *
@@ -657,7 +729,7 @@ static VALUE ruby_curl_easy_useragent_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.post_body = "some=form%20data&to=send" => string or nil
+ *   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.
@@ -671,7 +743,7 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
   
   char *data;
   long len;
-  
+
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   
   curl = rbce->curl;
@@ -681,8 +753,18 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
     rb_easy_del("postdata_buffer");
     
   } else {  
-    data = StringValuePtr(post_body);
-    len = RSTRING_LEN(post_body);
+    if (rb_type(post_body) == T_STRING) {
+      data = StringValuePtr(post_body);
+      len = RSTRING_LEN(post_body);
+    }
+    else if (rb_respond_to(post_body, rb_intern("to_s"))) {
+      VALUE str_body = rb_funcall(post_body, rb_intern("to_s"), 0);
+      data = StringValuePtr(str_body);
+      len = RSTRING_LEN(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 
     // request.  See CURLOPT_POSTFIELDS in the libcurl docs.
@@ -701,7 +783,7 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
 
 /*
  * call-seq:
- *   easy.post_body                                  => "string" or nil
+ *   easy.post_body                                  => string or nil
  *
  * Obtain the POST body used in this Curl::Easy instance.
  */
@@ -748,10 +830,14 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
     }
   }
 
+  // exit fast if the payload is empty
+  if (NIL_P(data)) { return data; }
+
   headers = rb_easy_get("headers");
   if( headers == Qnil ) { 
     headers = rb_hash_new();
   }
+
   if (rb_respond_to(data, rb_intern("read"))) {
     VALUE stat = rb_funcall(data, rb_intern("stat"), 0);
     if( stat ) {
@@ -760,7 +846,7 @@ 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, FIX2INT(size));
+      curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2LONG(size));
     }
     else if( rb_hash_aref(headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
       rb_hash_aset(headers, rb_str_new2("Transfer-Encoding"), rb_str_new2("chunked"));
@@ -776,11 +862,29 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
     rb_raise(rb_eRuntimeError, "PUT data must respond to read or to_s");
   }
   rb_easy_set("headers",headers);
-  
+
   // if we made it this far, all should be well.
   return data;
 }
 
+/*
+ * call-seq:
+ *   easy.ftp_commands = ["CWD /", "MKD directory"]   => ["CWD /", ...]
+ *
+ * Explicitly sets the list of commands to execute on the FTP server when calling perform
+ */
+static VALUE ruby_curl_easy_ftp_commands_set(VALUE self, VALUE ftp_commands) {
+  CURB_OBJECT_HSETTER(ruby_curl_easy, ftp_commands);
+}
+
+/*
+ * call-seq
+ *   easy.ftp_commands                                => array or nil
+ */
+static VALUE ruby_curl_easy_ftp_commands_get(VALUE self) {
+  CURB_OBJECT_HGETTER(ruby_curl_easy, ftp_commands);
+}
+
 /* ================== IMMED ATTRS ==================*/
 
 /*
@@ -918,7 +1022,8 @@ static VALUE ruby_curl_easy_http_auth_types_set(int argc, VALUE *argv, VALUE sel
 
   rb_scan_args(argc, argv, "*", &args_ary);
   Data_Get_Struct(self, ruby_curl_easy, rbce);
-  len = RARRAY_LEN(args_ary);
+
+  len = (int)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) { 
@@ -1106,7 +1211,52 @@ static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self, VALUE ftp_respo
 
 /*
  * call-seq:
- *   easy.username = "foo"  => String
+ *   easy.low_speed_limit = fixnum or nil        => fixnum or nil
+ *
+ * Set the transfer speed (in bytes per second) that the transfer should be
+ * below during +low_speed_time+ seconds for the library to consider it too
+ * slow and abort.
+ */
+static VALUE ruby_curl_easy_low_speed_limit_set(VALUE self, VALUE low_speed_limit) {
+  CURB_IMMED_SETTER(ruby_curl_easy, low_speed_limit, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.low_speed_limit                        => fixnum or nil
+ *
+ * Obtain the minimum transfer speed over +low_speed+time+ below which the
+ * transfer will be aborted.
+ */
+static VALUE ruby_curl_easy_low_speed_limit_get(VALUE self, VALUE low_speed_limit) {
+  CURB_IMMED_GETTER(ruby_curl_easy, low_speed_limit, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.low_speed_time = fixnum or nil        => fixnum or nil
+ *
+ * Set the time (in seconds) that the transfer should be below the
+ * +low_speed_limit+ for the library to consider it too slow and abort.
+ */
+static VALUE ruby_curl_easy_low_speed_time_set(VALUE self, VALUE low_speed_time) {
+  CURB_IMMED_SETTER(ruby_curl_easy, low_speed_time, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.low_speed_time                        => fixnum or nil
+ *
+ * Obtain the time that the transfer should be below +low_speed_limit+ for
+ * the library to abort it.
+ */
+static VALUE ruby_curl_easy_low_speed_time_get(VALUE self, VALUE low_speed_time) {
+  CURB_IMMED_GETTER(ruby_curl_easy, low_speed_time, 0);
+}
+
+/*
+ * call-seq:
+ *   easy.username = string                           => string
  *
  * Set the HTTP Authentication username.
  */
@@ -1120,7 +1270,7 @@ static VALUE ruby_curl_easy_username_set(VALUE self, VALUE username) {
 
 /*
  * call-seq:
- *   easy.username   => String
+ *   easy.username                                    => string
  * 
  * Get the current username
  */
@@ -1134,7 +1284,7 @@ static VALUE ruby_curl_easy_username_get(VALUE self, VALUE username) {
 
 /*
  * call-seq:
- *   easy.password = "foo"  => String
+ *   easy.password = string                           => string
  *
  * Set the HTTP Authentication password.
  */
@@ -1148,7 +1298,7 @@ static VALUE ruby_curl_easy_password_set(VALUE self, VALUE password) {
 
 /*
  * call-seq:
- *   easy.password   => String
+ *   easy.password                                    => string
  * 
  * Get the current password
  */
@@ -1160,11 +1310,75 @@ static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
 #endif
 }
 
+/*
+ * call-seq:
+ *   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
+ */
+static VALUE ruby_curl_easy_ssl_version_set(VALUE self, VALUE ssl_version) {
+  CURB_IMMED_SETTER(ruby_curl_easy, ssl_version, -1);
+}
+
+/*
+ * call-seq:
+ *   easy.ssl_version                                 => fixnum
+ *
+ * Get the version of SSL/TLS that libcurl will attempt to use.
+ */
+static VALUE ruby_curl_easy_ssl_version_get(VALUE self, VALUE ssl_version) {
+  CURB_IMMED_GETTER(ruby_curl_easy, ssl_version, -1);
+}
+
+/*
+ * 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.
+ */
+static VALUE ruby_curl_easy_use_ssl_set(VALUE self, VALUE use_ssl) {
+  CURB_IMMED_SETTER(ruby_curl_easy, use_ssl, -1);
+}
+
+/*
+ * call-seq:
+ *   easy.use_ssl                                     => fixnum
+ *
+ * Get the desired level for using SSL on FTP connections.
+ */
+static VALUE ruby_curl_easy_use_ssl_get(VALUE self, VALUE use_ssl) {
+  CURB_IMMED_GETTER(ruby_curl_easy, use_ssl, -1);
+}
+
+/*
+ * call-seq:
+ *   easy.ftp_filemethod = value                      => fixnum or nil
+ *
+ * Controls how libcurl reaches files on the server. Valid options are Curl::CURL_MULTICWD,
+ * Curl::CURL_NOCWD, and Curl::CURL_SINGLECWD (see libcurl docs for CURLOPT_FTP_METHOD).
+ */
+static VALUE ruby_curl_easy_ftp_filemethod_set(VALUE self, VALUE ftp_filemethod) {
+  CURB_IMMED_SETTER(ruby_curl_easy, ftp_filemethod, -1);
+}
+
+/*
+ * call-seq
+ *   easy.ftp_filemethod                              => fixnum
+ *
+ * Get the configuration for how libcurl will reach files on the server.
+ */
+static VALUE ruby_curl_easy_ftp_filemethod_get(VALUE self, VALUE ftp_filemethod) {
+  CURB_IMMED_GETTER(ruby_curl_easy, ftp_filemethod, -1);
+}
+
 /* ================== BOOL ATTRS ===================*/
 
 /*
  * call-seq:
- *   proxy_tunnel = boolean                           => boolean
+ *   easy.proxy_tunnel = boolean                      => boolean
  *
  * Configure whether this Curl instance will use proxy tunneling.
  */
@@ -1174,7 +1388,7 @@ static VALUE ruby_curl_easy_proxy_tunnel_set(VALUE self, VALUE proxy_tunnel) {
 
 /*
  * call-seq:
- *   proxy_tunnel?                                    => boolean
+ *   easy.proxy_tunnel?                               => boolean
  *
  * Determine whether this Curl instance will use proxy tunneling.
  */
@@ -1184,7 +1398,7 @@ static VALUE ruby_curl_easy_proxy_tunnel_q(VALUE self) {
 
 /*
  * call-seq:
- *   fetch_file_time = boolean                        => boolean
+ *   easy.fetch_file_time = boolean                   => boolean
  *
  * Configure whether this Curl instance will fetch remote file
  * times, if available.
@@ -1195,7 +1409,7 @@ static VALUE ruby_curl_easy_fetch_file_time_set(VALUE self, VALUE fetch_file_tim
 
 /*
  * call-seq:
- *   fetch_file_time?                                 => boolean
+ *   easy.fetch_file_time?                            => boolean
  *
  * Determine whether this Curl instance will fetch remote file
  * times, if available.
@@ -1206,7 +1420,7 @@ static VALUE ruby_curl_easy_fetch_file_time_q(VALUE self) {
 
 /*
  * call-seq:
- *   ssl_verify_peer = boolean                        => boolean
+ *   easy.ssl_verify_peer = boolean                   => boolean
  *
  * Configure whether this Curl instance will verify the SSL peer
  * certificate. When true (the default), and the verification fails to
@@ -1224,7 +1438,7 @@ static VALUE ruby_curl_easy_ssl_verify_peer_set(VALUE self, VALUE ssl_verify_pee
 
 /*
  * call-seq:
- *   ssl_verify_peer?                                 => boolean
+ *   easy.ssl_verify_peer?                            => boolean
  *
  * Determine whether this Curl instance will verify the SSL peer
  * certificate.
@@ -1235,7 +1449,7 @@ static VALUE ruby_curl_easy_ssl_verify_peer_q(VALUE self) {
 
 /*
  * call-seq:
- *   ssl_verify_host = boolean                        => boolean
+ *   easy.ssl_verify_host = boolean                   => boolean
  *
  * 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
@@ -1252,7 +1466,7 @@ static VALUE ruby_curl_easy_ssl_verify_host_set(VALUE self, VALUE ssl_verify_hos
 
 /*
  * call-seq:
- *   ssl_verify_host?                                 => boolean
+ *   easy.ssl_verify_host?                            => boolean
  *
  * Determine whether this Curl instance will verify that the server cert
  * is for the server it is known as.
@@ -1263,7 +1477,7 @@ static VALUE ruby_curl_easy_ssl_verify_host_q(VALUE self) {
 
 /*
  * call-seq:
- *   header_in_body = boolean                         => boolean
+ *   easy.header_in_body = boolean                    => boolean
  *
  * Configure whether this Curl instance will return HTTP headers
  * combined with body data. If this option is set true, both header
@@ -1275,10 +1489,10 @@ static VALUE ruby_curl_easy_header_in_body_set(VALUE self, VALUE header_in_body)
 
 /*
  * call-seq:
- *   header_in_body?                                  => boolean
+ *   easy.header_in_body?                             => boolean
  *
- * Determine whether this Curl instance will verify the SSL peer
- * certificate.
+ * Determine whether this Curl instance will return HTTP headers
+ * combined with body data.
  */
 static VALUE ruby_curl_easy_header_in_body_q(VALUE self) {
   CURB_BOOLEAN_GETTER(ruby_curl_easy, header_in_body);
@@ -1286,7 +1500,7 @@ static VALUE ruby_curl_easy_header_in_body_q(VALUE self) {
 
 /*
  * call-seq:
- *   use_netrc = boolean                              => boolean
+ *   easy.use_netrc = boolean                         => boolean
  *
  * Configure whether this Curl instance will use data from the user's
  * .netrc file for FTP connections.
@@ -1297,7 +1511,7 @@ static VALUE ruby_curl_easy_use_netrc_set(VALUE self, VALUE use_netrc) {
 
 /*
  * call-seq:
- *   use_netrc?                                       => boolean
+ *   easy.use_netrc?                                  => boolean
  *
  * Determine whether this Curl instance will use data from the user's
  * .netrc file for FTP connections.
@@ -1308,7 +1522,7 @@ static VALUE ruby_curl_easy_use_netrc_q(VALUE self) {
 
 /*
  * call-seq:
- *   follow_location = boolean                        => boolean
+ *   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
@@ -1317,10 +1531,29 @@ static VALUE ruby_curl_easy_use_netrc_q(VALUE self) {
 static VALUE ruby_curl_easy_follow_location_set(VALUE self, VALUE follow_location) {
   CURB_BOOLEAN_SETTER(ruby_curl_easy, follow_location);
 }
+/*
+ * call-seq:
+ *
+ * easy = Curl::Easy.new
+ * easy.autoreferer=true
+ */
+static VALUE ruby_curl_easy_autoreferer_set(VALUE self, VALUE autoreferer) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (Qtrue == autoreferer) {
+    curl_easy_setopt(rbce->curl, CURLOPT_AUTOREFERER, 1);
+  }
+  else {
+    curl_easy_setopt(rbce->curl, CURLOPT_AUTOREFERER, 0);
+  }
+
+  return autoreferer;
+}
 
 /*
  * call-seq:
- *   follow_location?                                 => boolean
+ *   easy.follow_location?                            => boolean
  *
  * Determine whether this Curl instance will follow Location: headers
  * in HTTP responses.
@@ -1331,7 +1564,7 @@ static VALUE ruby_curl_easy_follow_location_q(VALUE self) {
 
 /*
  * call-seq:
- *   unrestricted_auth = boolean                      => boolean
+ *   easy.unrestricted_auth = boolean                 => boolean
  *
  * Configure whether this Curl instance may use any HTTP authentication
  * method available when necessary.
@@ -1342,7 +1575,7 @@ static VALUE ruby_curl_easy_unrestricted_auth_set(VALUE self, VALUE unrestricted
 
 /*
  * call-seq:
- *   unrestricted_auth?                               => boolean
+ *   easy.unrestricted_auth?                          => boolean
  *
  * Determine whether this Curl instance may use any HTTP authentication
  * method available when necessary.
@@ -1416,7 +1649,7 @@ static VALUE ruby_curl_easy_enable_cookies_set(VALUE self, VALUE enable_cookies)
 
 /*
  * call-seq:
- *   easy.enable_cookies?                        => boolean
+ *   easy.enable_cookies?                             => boolean
  *
  * Determine whether the libcurl cookie engine is enabled for this
  * Curl::Easy instance.
@@ -1425,6 +1658,31 @@ static VALUE ruby_curl_easy_enable_cookies_q(VALUE self) {
   CURB_BOOLEAN_GETTER(ruby_curl_easy, enable_cookies);
 }
 
+/*
+ * call-seq:
+ *   easy.ignore_content_length = boolean
+ *
+ * Configure whether this Curl::Easy instance should ignore the content
+ * length header.
+ */
+static VALUE ruby_curl_easy_ignore_content_length_set(VALUE self, VALUE ignore_content_length)
+{
+  CURB_BOOLEAN_SETTER(ruby_curl_easy, ignore_content_length);
+}
+
+/*
+ * call-seq:
+ *   easy.ignore_content_length?                             => boolean
+ *
+ * Determine whether this Curl::Easy instance ignores the content
+ * length header.
+ */
+static VALUE ruby_curl_easy_ignore_content_length_q(VALUE self) {
+  CURB_BOOLEAN_GETTER(ruby_curl_easy, ignore_content_length);
+}
+
+
+
 /* ================= EVENT PROCS ================== */
 
 /*
@@ -1448,7 +1706,7 @@ static VALUE ruby_curl_easy_on_body_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_success { |easy| ... }                 => &lt;old handler&gt;
+ *   easy.on_success { |easy| ... }                   => &lt;old handler&gt;
  *
  * Assign or remove the +on_success+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1463,7 +1721,7 @@ static VALUE ruby_curl_easy_on_success_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_failure {|easy,code| ... }                 => &lt;old handler&gt;
+ *   easy.on_failure {|easy,code| ... }               => &lt;old handler&gt;
  *
  * Assign or remove the +on_failure+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1478,7 +1736,7 @@ static VALUE ruby_curl_easy_on_failure_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *   easy.on_complete {|easy| ... }                 => &lt;old handler&gt;
+ *   easy.on_complete {|easy| ... }                   => &lt;old handler&gt;
  *
  * Assign or remove the +on_complete+ handler for this Curl::Easy instance.
  * To remove a previously-supplied handler, call this method with no
@@ -1580,16 +1838,28 @@ 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 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);
+  *list = curl_slist_append(*list, StringValuePtr(ftp_command));
+
+  return ftp_command_string;
+}
+
 /***********************************************
  *
  * Setup a connection
  *
  * Always returns Qtrue, rb_raise on error.
  */
-VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
+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 **cmds = &(rbce->curl_ftp_commands);
 
   curl = rbce->curl;
 
@@ -1696,7 +1966,6 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
   /* general opts */
 
   curl_easy_setopt(curl, CURLOPT_HEADER, rbce->header_in_body);
-
   curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, rbce->follow_location);
   curl_easy_setopt(curl, CURLOPT_MAXREDIRS, rbce->max_redirs);
 
@@ -1717,6 +1986,9 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
   curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, rbce->connect_timeout);
   curl_easy_setopt(curl, CURLOPT_DNS_CACHE_TIMEOUT, rbce->dns_cache_timeout);
 
+  curl_easy_setopt(curl, CURLOPT_IGNORE_CONTENT_LENGTH, rbce->ignore_content_length);
+
+
 #if LIBCURL_VERSION_NUM >= 0x070a08
   curl_easy_setopt(curl, CURLOPT_FTP_RESPONSE_TIMEOUT, rbce->ftp_response_timeout);
 #else
@@ -1725,6 +1997,9 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
   }
 #endif
 
+  curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, rbce->low_speed_limit);
+  curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, rbce->low_speed_time);
+
   // Set up localport / proxy port
   // FIXME these won't get returned to default if they're unset Ruby
   if (rbce->proxy_port > 0) {
@@ -1803,6 +2078,9 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
     if (!rb_easy_nil("certpassword")) {
       curl_easy_setopt(curl, CURLOPT_SSLCERTPASSWD, rb_easy_get_str("certpassword"));
     }
+    if (!rb_easy_nil("cert_key")) {
+      curl_easy_setopt(curl, CURLOPT_SSLKEY, rb_easy_get_str("cert_key"));
+    }
   }
   if (!rb_easy_nil("cacert")) {
 #ifdef HAVE_CURL_CONFIG_CA
@@ -1811,7 +2089,25 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
     curl_easy_setopt(curl, CURLOPT_CAINFO, "/usr/local/share/curl/curl-ca-bundle.crt");
 #endif
   }
+
+#ifdef CURL_VERSION_SSL
+  if (rbce->ssl_version > 0) {
+    curl_easy_setopt(curl, CURLOPT_SSLVERSION, rbce->ssl_version);
+  }
+
+  if (rbce->use_ssl > 0) {
+    curl_easy_setopt(curl, CURB_FTPSSL, rbce->use_ssl);
+  }
+#else
+  if (rbce->ssl_version > 0 || rbce->use_ssl > 0) {
+    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);
+  }
+
   /* Set the user-agent string if specified */
   if (!rb_easy_nil("useragent")) {
     curl_easy_setopt(curl, CURLOPT_USERAGENT, rb_easy_get_str("useragent"));
@@ -1833,6 +2129,17 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
     }
   }
 
+  /* 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);
+    }
+
+    if (*cmds) {
+      curl_easy_setopt(curl, CURLOPT_QUOTE, *cmds);
+    }
+  }
+
   return Qnil;
 }
 /***********************************************
@@ -1841,17 +2148,24 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, struct curl_slist **hdrs ) {
  *
  * Always returns Qtrue.
  */
-VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, struct curl_slist *headers ) {
+VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
 
   CURL *curl = rbce->curl;
-  
-  // Free everything up
-  if (headers) {
-    curl_slist_free_all(headers);
+  struct curl_slist *ftp_commands;
+
+  /* Free everything up */
+  if (rbce->curl_headers) {
+    curl_slist_free_all(rbce->curl_headers);
     rbce->curl_headers = NULL;
   }
 
-  // clean up a PUT request's curl options.
+  ftp_commands = rbce->curl_ftp_commands;
+  if (ftp_commands) {
+    curl_slist_free_all(ftp_commands);
+    rbce->curl_ftp_commands = 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
     curl_easy_setopt(curl, CURLOPT_UPLOAD, 0);
@@ -1876,10 +2190,13 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, struct curl_slis
 static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
 
   VALUE ret;
-  VALUE multi = ruby_curl_multi_new(cCurlMulti);
 
-  rb_funcall(multi, rb_intern("add"), 1, self );
-  ret = rb_funcall(multi, rb_intern("perform"), 0);
+  /* 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")) {
@@ -1904,20 +2221,16 @@ static VALUE ruby_curl_easy_perform_get(VALUE self) {
   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);
 
   return handle_perform(self,rbce);
 }
 
 /*
- * 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.
+ * Common implementation of easy.http(verb) and easy.http_delete
  */
-static VALUE ruby_curl_easy_perform_delete(VALUE self) {
+static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
   ruby_curl_easy *rbce;
   CURL *curl;
   VALUE retval;
@@ -1925,7 +2238,7 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
-  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, verb);
 
   retval = handle_perform(self,rbce);
 
@@ -1934,6 +2247,39 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
   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)
+ *
+ * Send an HTTP request with method set to verb, 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_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));
+  }
+  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));
+  }
+  else {
+    rb_raise(rb_eRuntimeError, "Invalid HTTP VERB, must response to 'to_s'");
+  }
+}
+
 /*
  * call-seq:
  *   easy.perform                                     => true
@@ -1985,6 +2331,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;
 
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
+
   if (rbce->multipart_form_post) {
     VALUE ret;
     struct curl_httppost *first = NULL, *last = NULL;
@@ -2006,12 +2354,22 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
 
     return ret;
   } else {
-    VALUE post_body;
+    VALUE post_body = Qnil;
+    /* TODO: check for PostField.file and raise error before to_s fails */
     if ((post_body = rb_funcall(args_ary, idJoin, 1, rbstrAmp)) == Qnil) {
       rb_raise(eCurlErrError, "Failed to join arguments");
       return Qnil;
     } else {
-      ruby_curl_easy_post_body_set(self, post_body);
+      /* if the function call above returns an empty string because no additional arguments were passed this makes sure
+         a previously set easy.post_body = "arg=foo&bar=bin"  will be honored */
+      if( post_body != Qnil && rb_type(post_body) == T_STRING && RSTRING_LEN(post_body) > 0 ) {
+        ruby_curl_easy_post_body_set(self, post_body);
+      }
+
+      /* if post body is not defined, set it so we enable POST header, even though the request body is empty */
+      if( rb_easy_nil("postdata_buffer") ) {
+        ruby_curl_easy_post_body_set(self, post_body);
+      }
 
       return handle_perform(self,rbce);
     }
@@ -2065,6 +2423,40 @@ 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|
@@ -2102,6 +2494,7 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
   
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
   
   return handle_perform(self, rbce);
@@ -2194,6 +2587,30 @@ static VALUE ruby_curl_easy_response_code_get(VALUE self) {
   return LONG2NUM(code);
 }
 
+#if defined(HAVE_CURLINFO_PRIMARY_IP)
+/*
+ * call-seq:
+ *   easy.primary_ip                                  => "xx.xx.xx.xx" or nil
+ *
+ *   Retrieve the resolved IP of the most recent connection
+ *   done with this curl handle. This string may be  IPv6 if
+ *   that's enabled. This feature requires curl 7.19.x and above
+ */
+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);
+
+  if (ip && ip[0]) {    // curl returns empty string if none
+    return rb_str_new2(ip);
+  } else {
+    return Qnil;
+  }
+}
+#endif
+
 /*
  * call-seq:
  *   easy.http_connect_code                           => fixnum
@@ -2358,7 +2775,7 @@ static VALUE ruby_curl_easy_redirect_time_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.redirect_count                           => integer
+ *   easy.redirect_count                            => integer
  *
  * Retrieve the total number of redirections that were actually followed.
  *
@@ -2606,7 +3023,7 @@ static VALUE ruby_curl_easy_os_errno_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.num_connects                                    => integer
+ *   easy.num_connects                                => integer
  *
  * Retrieve the number of new connections libcurl had to create to achieve
  * the previous transfer (only the successful connects are counted).
@@ -2651,7 +3068,7 @@ Pass a pointer to a long to receive the last socket used by this curl session. I
 
 /*
  * call-seq:
- *   easy.content_type                                => "content/type" or nil
+ *   easy.ftp_entry_path                                => "C:\ftp\root\" or nil
  *
  * Retrieve the path of the entry path. That is the initial path libcurl ended
  * up in when logging on to the remote FTP server. This returns +nil+ if
@@ -2680,7 +3097,7 @@ static VALUE ruby_curl_easy_ftp_entry_path_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.inspect                                => "#<Curl::Easy http://google.com/>"
+ *   easy.inspect                                     => "#<Curl::Easy http://google.com/>"
  */
 static VALUE ruby_curl_easy_inspect(VALUE self) {
   char buf[64];
@@ -2693,10 +3110,10 @@ static VALUE ruby_curl_easy_inspect(VALUE self) {
     /* "#<Net::HTTP http://www.google.com/:80 open=false>" */
     memcpy(buf,"#<Curl::Easy ", 13);
     memcpy(buf+13,RSTRING_PTR(url), (len - 13));
-    buf[len-1] = '>';
+    buf[len++] = '>';
     return rb_str_new(buf,len);
   }
-  return rb_str_new2("#<Curl::Easy");
+  return rb_str_new2("#<Curl::Easy>");
 }
 
 
@@ -2723,9 +3140,9 @@ static VALUE ruby_curl_easy_escape(VALUE self, VALUE svalue) {
   if( rb_type(str) != T_STRING ) { str = rb_funcall(str,rb_intern("to_s"),0); }
 
 #if (LIBCURL_VERSION_NUM >= 0x070f04)
-  result = (char*)curl_easy_escape(rbce->curl, StringValuePtr(str), RSTRING_LEN(str));
+  result = (char*)curl_easy_escape(rbce->curl, StringValuePtr(str), (int)RSTRING_LEN(str));
 #else
-  result = (char*)curl_escape(StringValuePtr(str), RSTRING_LEN(str));
+  result = (char*)curl_escape(StringValuePtr(str), (int)RSTRING_LEN(str));
 #endif
 
   rresult = rb_str_new2(result);
@@ -2736,7 +3153,7 @@ static VALUE ruby_curl_easy_escape(VALUE self, VALUE svalue) {
 
 /*
  * call-seq:
- *   easy.unescape("some%20text")                       => "some text"
+ *   easy.unescape("some%20text")                     => "some text"
  *
  * Convert the given URL encoded input string to a "plain string" and return
  * the result. All input characters that are URL encoded (%XX where XX is a
@@ -2751,7 +3168,7 @@ static VALUE ruby_curl_easy_unescape(VALUE self, VALUE str) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
 #if (LIBCURL_VERSION_NUM >= 0x070f04)
-  result = (char*)curl_easy_unescape(rbce->curl, StringValuePtr(str), RSTRING_LEN(str), &rlen);
+  result = (char*)curl_easy_unescape(rbce->curl, StringValuePtr(str), (int)RSTRING_LEN(str), &rlen);
 #else
   result = (char*)curl_unescape(StringValuePtr(str), RSTRING_LEN(str));
   rlen = strlen(result);
@@ -2807,7 +3224,7 @@ static VALUE ruby_curl_easy_class_perform_get(int argc, VALUE *argv, VALUE klass
 
 /*
  * call-seq:
- *   Curl::Easy.http_delete(url) { |easy| ... }          => #&lt;Curl::Easy...&gt;
+ *   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.
@@ -2824,7 +3241,7 @@ static VALUE ruby_curl_easy_class_perform_delete(int argc, VALUE *argv, VALUE kl
 
 /*
  * call-seq:
- *   Curl::Easy.http_head(url) { |easy| ... }          => #&lt;Curl::Easy...&gt;
+ *   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.
@@ -2916,6 +3333,8 @@ void init_curb_easy() {
   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);
+  rb_define_method(cCurlEasy, "cert_key=", ruby_curl_easy_cert_key_set, 1);
+  rb_define_method(cCurlEasy, "cert_key", ruby_curl_easy_cert_key_get, 0);
   rb_define_method(cCurlEasy, "cacert=", ruby_curl_easy_cacert_set, 1);
   rb_define_method(cCurlEasy, "cacert", ruby_curl_easy_cacert_get, 0);
   rb_define_method(cCurlEasy, "certpassword=", ruby_curl_easy_certpassword_set, 1);
@@ -2928,6 +3347,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "post_body=", ruby_curl_easy_post_body_set, 1);
   rb_define_method(cCurlEasy, "post_body", ruby_curl_easy_post_body_get, 0);
   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, "local_port=", ruby_curl_easy_local_port_set, 1);
   rb_define_method(cCurlEasy, "local_port", ruby_curl_easy_local_port_get, 0);
@@ -2951,6 +3372,16 @@ void init_curb_easy() {
   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);
   rb_define_method(cCurlEasy, "ftp_response_timeout", ruby_curl_easy_ftp_response_timeout_get, 0);
+  rb_define_method(cCurlEasy, "low_speed_limit=", ruby_curl_easy_low_speed_limit_set, 1);
+  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, "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);
+  rb_define_method(cCurlEasy, "use_ssl", ruby_curl_easy_use_ssl_get, 0);
+  rb_define_method(cCurlEasy, "ftp_filemethod=", ruby_curl_easy_ftp_filemethod_set, 1);
+  rb_define_method(cCurlEasy, "ftp_filemethod", ruby_curl_easy_ftp_filemethod_get, 0);
 
   rb_define_method(cCurlEasy, "username=", ruby_curl_easy_username_set, 1);
   rb_define_method(cCurlEasy, "username", ruby_curl_easy_username_get, 0);
@@ -2971,6 +3402,7 @@ void init_curb_easy() {
   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);
   rb_define_method(cCurlEasy, "unrestricted_auth?", ruby_curl_easy_unrestricted_auth_q, 0);
   rb_define_method(cCurlEasy, "verbose=", ruby_curl_easy_verbose_set, 1);
@@ -2979,6 +3411,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "multipart_form_post?", ruby_curl_easy_multipart_form_post_q, 0);
   rb_define_method(cCurlEasy, "enable_cookies=", ruby_curl_easy_enable_cookies_set, 1);
   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, "on_body", ruby_curl_easy_on_body_set, -1);
   rb_define_method(cCurlEasy, "on_header", ruby_curl_easy_on_header_set, -1);
@@ -2989,6 +3423,7 @@ void init_curb_easy() {
   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);
@@ -2996,6 +3431,11 @@ void init_curb_easy() {
   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);
@@ -3003,6 +3443,9 @@ void init_curb_easy() {
 
   rb_define_method(cCurlEasy, "last_effective_url", ruby_curl_easy_last_effective_url_get, 0);
   rb_define_method(cCurlEasy, "response_code", ruby_curl_easy_response_code_get, 0);
+#if defined(HAVE_CURLINFO_PRIMARY_IP)
+  rb_define_method(cCurlEasy, "primary_ip", ruby_curl_easy_primary_ip_get, 0);
+#endif
   rb_define_method(cCurlEasy, "http_connect_code", ruby_curl_easy_http_connect_code_get, 0);
   rb_define_method(cCurlEasy, "file_time", ruby_curl_easy_file_time_get, 0);
   rb_define_method(cCurlEasy, "total_time", ruby_curl_easy_total_time_get, 0);
@@ -3025,7 +3468,9 @@ void init_curb_easy() {
   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, "ftp_entry_path", ruby_curl_easy_ftp_entry_path_get, 0);
-  rb_define_method(cCurlEasy, "inspect", ruby_curl_easy_inspect, 0);
+
+  rb_define_method(cCurlEasy, "close", ruby_curl_easy_close, 0);
+  rb_define_method(cCurlEasy, "reset", ruby_curl_easy_reset, 0);
 
   /* Curl utils */
   rb_define_method(cCurlEasy, "escape", ruby_curl_easy_escape, 1);
@@ -3034,4 +3479,5 @@ void init_curb_easy() {
   /* Runtime support */
   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);
 }