curb 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ca81b9cb8fd33720ab17ba3eff9e9ae4fa1a10542feb60897ac94d7cd801ac
-  data.tar.gz: e8747cc63a63ca1561288dd9480b6c30c9dda0a371a6909eb1e2ad2a9a8b6947
+  metadata.gz: 805549f6e3fe9190d76c507fa67bf6f6e2a6bbe65bde611cb3aeee6c78cad51f
+  data.tar.gz: 7f6cab9c618e4535e7ff46b48d11bb5f307158d850b95bd560432dfeb9ea3144
 SHA512:
-  metadata.gz: 112d4c34fd70b3b77a58e133b9c873d5ac7f850d2644fe02a9713771b47be636cfbc2c66b44bbf59e047cc84d83aa496c2e67cbfd8f2987509577589a87d20f0
-  data.tar.gz: a593f46d71b17af90cb9244ee7a92c133eca76024146d9097806f91ec70f34b4611988141063a7624fd51ea103d872495e1efa94b2b6d718ee0a700ca86ef325
+  metadata.gz: 98f411070f4c3ef1646de29052a2c9a37e7aa2c9009102a7f4e483d1d1188d8bbdae50647e6dd4c8c7439120619e22df5f8c90bba6e1a088e2762cc29109c63d
+  data.tar.gz: bb8ad84d03972d1e42ce61622060019edc4d6286bab9ab459d2fe9e8ccd3cdc04490a8ba58715fd4efa30e3babf82ac96afce3f5b80fddd1d0bd4d47b197a5f1

data/ext/curb.h

@@ -28,11 +28,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "1.0.6"
-#define CURB_VER_NUM   1006
+#define CURB_VERSION   "1.0.7"
+#define CURB_VER_NUM   1007
 #define CURB_VER_MAJ   1
 #define CURB_VER_MIN   0
-#define CURB_VER_MIC   6
+#define CURB_VER_MIC   7
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -31,6 +31,7 @@ static FILE * rb_io_stdio_file(rb_io_t *fptr) {
   return fptr->f;
 }
 #endif
+static struct curl_slist *duplicate_curl_slist(struct curl_slist *list);
 
 /* ================== CURL HANDLER FUNCS ==============*/
 
@@ -264,7 +265,7 @@ void curl_easy_free(ruby_curl_easy *rbce) {
 static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->opts = rb_hash_new();
 
-  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+  memset(rbce->err_buf, 0, CURL_ERROR_SIZE);
 
   rbce->curl_headers = NULL;
   rbce->curl_proxy_headers = NULL;
@@ -370,6 +371,16 @@ static VALUE ruby_curl_easy_initialize(int argc, VALUE *argv, VALUE self) {
   return self;
 }
 
+/* Helper to duplicate a curl_slist */
+static struct curl_slist *duplicate_curl_slist(struct curl_slist *list) {
+    struct curl_slist *dup = NULL;
+    struct curl_slist *tmp;
+    for (tmp = list; tmp; tmp = tmp->next) {
+        dup = curl_slist_append(dup, tmp->data);
+    }
+    return dup;
+}
+
 /*
  * call-seq:
  *   easy.clone                                       => <easy clone>
@@ -384,14 +395,22 @@ static VALUE ruby_curl_easy_clone(VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
   newrbce = ALLOC(ruby_curl_easy);
+  /* shallow copy */
   memcpy(newrbce, rbce, sizeof(ruby_curl_easy));
+
+  /* now deep copy */
   newrbce->curl = curl_easy_duphandle(rbce->curl);
-  newrbce->curl_headers = NULL;
-  newrbce->curl_proxy_headers = NULL;
-  newrbce->curl_ftp_commands = NULL;
-  newrbce->curl_resolve = NULL;
+  newrbce->curl_headers = (rbce->curl_headers) ? duplicate_curl_slist(rbce->curl_headers) : NULL;
+  newrbce->curl_proxy_headers = (rbce->curl_proxy_headers) ? duplicate_curl_slist(rbce->curl_proxy_headers) : NULL;
+  newrbce->curl_ftp_commands = (rbce->curl_ftp_commands) ? duplicate_curl_slist(rbce->curl_ftp_commands) : NULL;
+  newrbce->curl_resolve = (rbce->curl_resolve) ? duplicate_curl_slist(rbce->curl_resolve) : NULL;
 
-  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
+  if (rbce->opts != Qnil) {
+    newrbce->opts = rb_funcall(rbce->opts, rb_intern("dup"), 0);
+  }
+
+  /* Set the error buffer on the new curl handle using the new err_buf */
+  curl_easy_setopt(newrbce->curl, CURLOPT_ERRORBUFFER, newrbce->err_buf);
 
   return Data_Wrap_Struct(cCurlEasy, curl_easy_mark, curl_easy_free, newrbce);
 }
@@ -2614,7 +2633,7 @@ static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
-  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+  memset(rbce->err_buf, 0, CURL_ERROR_SIZE);
 
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, verb);
 
@@ -2681,7 +2700,7 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
-  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+  memset(rbce->err_buf, 0, CURL_ERROR_SIZE);
 
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
 
@@ -2754,7 +2773,7 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
-  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+  memset(rbce->err_buf, 0, CURL_ERROR_SIZE);
 
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
@@ -3364,14 +3383,16 @@ static VALUE ruby_curl_easy_num_connects_get(VALUE self) {
 
 /*
  * call-seq:
- *   easy.cookielist                                => array
+ *   easy.cookielist                                => cookielist
  *
  * Retrieves the cookies curl knows in an array of strings.
  * Returned strings are in Netscape cookiejar format or in Set-Cookie format.
+ * Since 7.43.0 cookies in the Set-Cookie format without a domain name are not exported.
  *
- * See also option CURLINFO_COOKIELIST of curl_easy_getopt(3) to see how libcurl behaves.
- *
- * (requires libcurl 7.14.1 or higher, otherwise -1 is always returned).
+ * @see https://curl.se/libcurl/c/CURLINFO_COOKIELIST.html option <code>CURLINFO_COOKIELIST</code> of 
+ *   <code>curl_easy_getopt(3)</code> to see how libcurl behaves.
+ * @note requires libcurl 7.14.1 or higher, otherwise +-1+ is always returned
+ * @return [Array<String>, nil, -1] array of strings, or +nil+ if there are no cookies, or +-1+ if the libcurl version is too old
 */
 static VALUE ruby_curl_easy_cookielist_get(VALUE self) {
 #ifdef HAVE_CURLINFO_COOKIELIST
@@ -3482,9 +3503,16 @@ static VALUE ruby_curl_easy_last_error(VALUE self) {
 
 /*
  * call-seq:
- *   easy.setopt Fixnum, value  => value
+ *   easy.setopt(opt, val)  => val
  *
  * Initial access to libcurl curl_easy_setopt
+ *
+ * @param [Fixnum] opt The option to set, see +Curl::CURLOPT_*+ constants
+ * @param [Object] val
+ * @return [Object] val
+ * @raise [TypeError] if the option is not supported
+ * @note Some options - like url or cookie - aren't set directly throught +curl_easy_setopt+, but stored in the Ruby object state.
+ * @note When +curl_easy_setopt+ is called, return value is not checked here.
  */
 static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   ruby_curl_easy *rbce;
@@ -3650,6 +3678,11 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     curl_easy_setopt(rbce->curl, CURLOPT_SSL_SESSIONID_CACHE, NUM2LONG(val));
     break;
 #endif
+#if HAVE_CURLOPT_COOKIELIST
+  case CURLOPT_COOKIELIST: {
+	curl_easy_setopt(rbce->curl, CURLOPT_COOKIELIST, StringValueCStr(val));
+    } break;
+#endif
 #if HAVE_CURLOPT_PROXY_SSL_VERIFYHOST
   case CURLOPT_PROXY_SSL_VERIFYHOST:
     curl_easy_setopt(rbce->curl, CURLOPT_PROXY_SSL_VERIFYHOST, NUM2LONG(val));
@@ -3664,9 +3697,13 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
 
 /*
  * call-seq:
- *   easy.getinfo Fixnum => value
+ *   easy.getinfo(opt) => nil
  *
  * Iniital access to libcurl curl_easy_getinfo, remember getinfo doesn't return the same values as setopt
+ *
+ * @note This method is not implemented yet.
+ * @param [Fixnum] code Constant +CURLINFO_*+ from libcurl
+ * @return [nil]
  */
 static VALUE ruby_curl_easy_get_opt(VALUE self, VALUE opt) {
   return Qnil;

data/ext/curb_multi.c

@@ -27,6 +27,21 @@
   #include <fcntl.h>
 #endif
 
+#ifdef HAVE_CURL_MULTI_WAIT
+#include <stdint.h>  /* for intptr_t */
+
+struct wait_args {
+  CURLM *handle;
+  long timeout_ms;
+  int numfds;
+};
+static void *curl_multi_wait_wrapper(void *p) {
+  struct wait_args *args = p;
+  CURLMcode code = curl_multi_wait(args->handle, NULL, 0, args->timeout_ms, &args->numfds);
+  return (void *)(intptr_t)code;
+}
+#endif
+
 extern VALUE mCurl;
 static VALUE idCall;
 
@@ -226,6 +241,8 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
 
   mcode = curl_multi_add_handle(rbcm->handle, rbce->curl);
   if (mcode != CURLM_CALL_MULTI_PERFORM && mcode != CURLM_OK) {
+    ruby_curl_easy_cleanup(easy, rbce);
+
     raise_curl_multi_error_exception(mcode);
   }
 
@@ -264,6 +281,7 @@ VALUE ruby_curl_multi_remove(VALUE self, VALUE rb_easy_handle) {
 
   return self;
 }
+
 static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   CURLMcode result;
   ruby_curl_easy *rbce;
@@ -528,7 +546,6 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
   do {
     while (rbcm->running) {
-
 #ifdef HAVE_CURL_MULTI_TIMEOUT
       /* get the curl suggested time out */
       mcode = curl_multi_timeout(rbcm->handle, &timeout_milliseconds);
@@ -552,6 +569,31 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
                                                         /* or buggy versions libcurl sometimes reports huge timeouts... let's cap it */
       }
 
+#ifdef HAVE_CURL_MULTI_WAIT
+      {
+        struct wait_args wait_args;
+        wait_args.handle     = rbcm->handle;
+        wait_args.timeout_ms = timeout_milliseconds;
+        wait_args.numfds     = 0;
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+        CURLMcode wait_rc = (CURLMcode)(intptr_t)
+                            rb_thread_call_without_gvl(curl_multi_wait_wrapper, &wait_args, RUBY_UBF_IO, NULL);
+#else
+        CURLMcode wait_rc = curl_multi_wait(rbcm->handle, NULL, 0, timeout_milliseconds, &wait_args.numfds);
+#endif
+        if (wait_rc != CURLM_OK) {
+          raise_curl_multi_error_exception(wait_rc);
+        }
+        if (wait_args.numfds == 0) {
+          rb_thread_wait_for(tv_100ms);
+        }
+        /* Process pending transfers after waiting */
+        rb_curl_multi_run(self, rbcm->handle, &(rbcm->running));
+        rb_curl_multi_read_info(self, rbcm->handle);
+        if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self); }
+      }
+#else
+
       tv.tv_sec  = 0; /* never wait longer than 1 second */
       tv.tv_usec = (int)(timeout_milliseconds * 1000); /* XXX: int is the right type for OSX, what about linux? */
 
@@ -618,6 +660,7 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
         if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
         break;
       }
+#endif /* HAVE_CURL_MULTI_WAIT */
     }
 
   } while( rbcm->running );

data/ext/curb_postfield.c

@@ -421,71 +421,108 @@ static VALUE ruby_curl_postfield_content_proc_set(int argc, VALUE *argv, VALUE s
  * Only content fields may be converted to strings.
  */
 static VALUE ruby_curl_postfield_to_str(VALUE self) {
-  // FIXME This is using the deprecated curl_escape func
   ruby_curl_postfield *rbcpf;
   VALUE result = Qnil;
   VALUE name = Qnil;
   char *tmpchrs;
-  
+#ifdef HAVE_CURL_EASY_ESCAPE
+  CURL *curl_handle = NULL;
+#endif
+
   Data_Get_Struct(self, ruby_curl_postfield, rbcpf);
 
-    if (rbcpf->name != Qnil) {
-      name = rbcpf->name;
-      if (rb_type(name) == T_STRING) {
-        name = rbcpf->name;
-      } else if (rb_respond_to(name,rb_intern("to_s"))) {
+  if (rbcpf->name != Qnil) {
+    name = rbcpf->name;
+    if (TYPE(name) != T_STRING) {
+      if (rb_respond_to(name, rb_intern("to_s")))
         name = rb_funcall(name, rb_intern("to_s"), 0);
-      }
-      else {
-        name = Qnil; // we can't handle this object
-      }
-    }
-    if (name == Qnil) {
-      rb_raise(eCurlErrInvalidPostField, "Cannot convert unnamed field to string %s:%d, make sure your field name responds_to :to_s", __FILE__, __LINE__);
+      else
+        name = Qnil;
     }
+  }
+  if (name == Qnil) {
+    rb_raise(eCurlErrInvalidPostField,
+             "Cannot convert unnamed field to string %s:%d, make sure your field name responds_to :to_s",
+             __FILE__, __LINE__);
+  }
+  /* Force field name to UTF-8 before escaping */
+  VALUE name_utf8 = rb_str_export_to_enc(name, rb_utf8_encoding());
 
-    tmpchrs = curl_escape(StringValuePtr(name), (int)RSTRING_LEN(name));
-    
-    if (!tmpchrs) {
-      rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name `%s'", tmpchrs);
-    } else {
-      VALUE tmpcontent = Qnil;
-      VALUE escd_name = rb_str_new2(tmpchrs);
-      curl_free(tmpchrs);
-      
-      if (rbcpf->content_proc != Qnil) {
-        tmpcontent = rb_funcall(rbcpf->content_proc, idCall, 1, self);
-      } else if (rbcpf->content != Qnil) {
-        tmpcontent = rbcpf->content;
-      } else if (rbcpf->local_file != Qnil) {
-        tmpcontent = rbcpf->local_file;
-      } else if (rbcpf->remote_file != Qnil) {
-        tmpcontent = rbcpf->remote_file;
-      } else {
-        tmpcontent = rb_str_new2("");
-      }
-      if (TYPE(tmpcontent) != T_STRING) {
-        if (rb_respond_to(tmpcontent, rb_intern("to_s"))) {
-          tmpcontent = rb_funcall(tmpcontent, rb_intern("to_s"), 0);
-        }
-        else {
-          rb_raise(rb_eRuntimeError, "postfield(%s) is not a string and does not respond_to to_s", RSTRING_PTR(escd_name) );
-        }
-      }
-      //fprintf(stderr, "encoding content: %ld - %s\n", RSTRING_LEN(tmpcontent), RSTRING_PTR(tmpcontent) );
-      tmpchrs = curl_escape(RSTRING_PTR(tmpcontent), (int)RSTRING_LEN(tmpcontent));
-      if (!tmpchrs) {
-        rb_raise(eCurlErrInvalidPostField, "Failed to url-encode content `%s'", tmpchrs);
-      } else {
-        VALUE escd_content = rb_str_new2(tmpchrs);
-        curl_free(tmpchrs);
-        
-        result = escd_name;
-        rb_str_cat(result, "=", 1);
-        rb_str_concat(result, escd_content); 
-      }
+#ifdef HAVE_CURL_EASY_ESCAPE
+  curl_handle = curl_easy_init();
+  if (!curl_handle) {
+    rb_raise(eCurlErrInvalidPostField, "Failed to initialize curl handle for escaping");
+  }
+  tmpchrs = curl_easy_escape(curl_handle, StringValuePtr(name_utf8), (int)RSTRING_LEN(name_utf8));
+  if (!tmpchrs) {
+    curl_easy_cleanup(curl_handle);
+    rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name");
+  }
+#else
+  tmpchrs = curl_escape(StringValuePtr(name_utf8), (int)RSTRING_LEN(name_utf8));
+  if (!tmpchrs) {
+    rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name");
+  }
+#endif
+
+  VALUE escd_name = rb_str_new2(tmpchrs);
+#ifdef HAVE_CURL_EASY_ESCAPE
+  curl_free(tmpchrs);
+#else
+  curl_free(tmpchrs);
+#endif
+
+  VALUE tmpcontent = Qnil;
+  if (rbcpf->content_proc != Qnil) {
+    tmpcontent = rb_funcall(rbcpf->content_proc, idCall, 1, self);
+  } else if (rbcpf->content != Qnil) {
+    tmpcontent = rbcpf->content;
+  } else if (rbcpf->local_file != Qnil) {
+    tmpcontent = rbcpf->local_file;
+  } else if (rbcpf->remote_file != Qnil) {
+    tmpcontent = rbcpf->remote_file;
+  } else {
+    tmpcontent = rb_str_new2("");
+  }
+  if (TYPE(tmpcontent) != T_STRING) {
+    if (rb_respond_to(tmpcontent, rb_intern("to_s")))
+      tmpcontent = rb_funcall(tmpcontent, rb_intern("to_s"), 0);
+    else {
+#ifdef HAVE_CURL_EASY_ESCAPE
+      curl_easy_cleanup(curl_handle);
+#endif
+      rb_raise(rb_eRuntimeError,
+               "postfield(%s) is not a string and does not respond_to to_s",
+               RSTRING_PTR(escd_name));
     }
-  
+  }
+  /* Force content to UTF-8 before escaping */
+  VALUE content_utf8 = rb_str_export_to_enc(tmpcontent, rb_utf8_encoding());
+#ifdef HAVE_CURL_EASY_ESCAPE
+  tmpchrs = curl_easy_escape(curl_handle, StringValuePtr(content_utf8), (int)RSTRING_LEN(content_utf8));
+  if (!tmpchrs) {
+    curl_easy_cleanup(curl_handle);
+    rb_raise(eCurlErrInvalidPostField, "Failed to url-encode content");
+  }
+#else
+  tmpchrs = curl_escape(StringValuePtr(content_utf8), (int)RSTRING_LEN(content_utf8));
+  if (!tmpchrs) {
+    rb_raise(eCurlErrInvalidPostField, "Failed to url-encode content");
+  }
+#endif
+
+  VALUE escd_content = rb_str_new2(tmpchrs);
+#ifdef HAVE_CURL_EASY_ESCAPE
+  curl_free(tmpchrs);
+  curl_easy_cleanup(curl_handle);
+#else
+  curl_free(tmpchrs);
+#endif
+
+  result = escd_name;
+  rb_str_cat(result, "=", 1);
+  rb_str_concat(result, escd_content);
+
   return result;
 }
 

data/ext/extconf.rb

@@ -467,6 +467,8 @@ have_func('rb_thread_blocking_region')
 have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
 have_header('ruby/io.h')
 have_func('rb_io_stdio_file')
+have_func('curl_multi_wait')
+have_func('curl_easy_duphandle')
 
 create_header('curb_config.h')
 create_makefile('curb_core')

data/lib/curl/multi.rb

@@ -95,7 +95,7 @@ module Curl
 
         # configure the multi handle
         multi_options.each { |k,v| m.send("#{k}=", v) }
-        callbacks = [:on_progress,:on_debug,:on_failure,:on_success,:on_redirect,:on_body,:on_header]
+        callbacks = [:on_progress,:on_debug,:on_failure,:on_success,:on_redirect,:on_missing,:on_body,:on_header]
 
         add_free_handle = proc do|conf, easy|
           c       = conf.dup # avoid being destructive to input

data/tests/helper.rb

@@ -80,6 +80,10 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
       res.status = 404
     elsif req.path.match(/error$/)
       res.status = 500
+    elsif req.path.match(/get_cookies$/)
+      res['Content-Type'] = "text/plain"
+      res.body = req['Cookie']
+      return
     end
     respond_with("GET#{req.query_string}",req,res)
   end
@@ -90,7 +94,18 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_POST(req,res)
-    if req.query['filename'].nil?
+    if req.path.match(/set_cookies$/)
+      JSON.parse(req.body || '[]', symbolize_names: true).each do |hash|
+        cookie = WEBrick::Cookie.new(hash.fetch(:name), hash.fetch(:value))
+        cookie.domain = hash[:domain] if hash.key?(:domain)
+        cookie.expires = hash[:expires] if hash.key?(:expires)
+        cookie.path = hash[:path] if hash.key?(:path)
+        cookie.secure = hash[:secure] if hash.key?(:secure)
+        cookie.max_age = hash[:max_age] if hash.key?(:max_age)
+        res.cookies.push(cookie)
+      end
+      respond_with('OK', req, res)
+    elsif req.query['filename'].nil?
       if req.body
         params = {}
         req.body.split('&').map{|s| k,v=s.split('='); params[k] = v }

data/tests/tc_curl_easy.rb

@@ -110,7 +110,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end    
 
   def test_class_perform_02
-    data = ""
+    data = String.new
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL) { |curl| curl.on_body { |d| data << d; d.length } }    
 
     assert_nil c.body_str
@@ -211,7 +211,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end    
 
   def test_get_02
-    data = ""
+    data = String.new
     c = Curl::Easy.new($TEST_URL) do |curl|
       curl.on_body { |d| data << d; d.length }
     end
@@ -1068,13 +1068,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_easy_http_verbs_must_respond_to_str
-    # issue http://github.com/taf2/curb/issues#issue/45
+    # issue http://github.com/taf2/curb/issues/45
     assert_nothing_raised do
-      c = Curl::Easy.new ; c.url = 'http://example.com' ; c.http(:get)
+      c = Curl::Easy.new ; c.url = TestServlet.url ; c.http(:get)
     end
 
     assert_raise RuntimeError do
-      c = Curl::Easy.new ; c.url = 'http://example.com' ; c.http(FooNoToS.new)
+      c = Curl::Easy.new ; c.url = TestServlet.url ; c.http(FooNoToS.new)
     end
 
   end

data/tests/tc_curl_easy_cookielist.rb

@@ -0,0 +1,277 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'json'
+
+class TestCurbCurlEasyCookielist < Test::Unit::TestCase
+  def test_setopt_cookielist
+    easy = Curl::Easy.new
+    # DateTime handles time zone correctly
+    expires = (Date.today + 2).to_datetime
+    easy.setopt(Curl::CURLOPT_COOKIELIST, "Set-Cookie: c1=v1; domain=localhost; expires=#{expires.httpdate};")
+    easy.setopt(Curl::CURLOPT_COOKIELIST, 'Set-Cookie: c2=v2; domain=localhost')
+    easy.setopt(Curl::CURLOPT_COOKIELIST, "Set-Cookie: c3=v3; expires=#{expires.httpdate};")
+    easy.setopt(Curl::CURLOPT_COOKIELIST, 'Set-Cookie: c4=v4;')
+    easy.setopt(Curl::CURLOPT_COOKIELIST, "Set-Cookie: c5=v5; domain=127.0.0.1; expires=#{expires.httpdate};")
+    easy.setopt(Curl::CURLOPT_COOKIELIST, 'Set-Cookie: c6=v6; domain=127.0.0.1;;')
+
+    # Since 7.43.0 cookies that were imported in the Set-Cookie format without a domain name are not exported by this option.
+    # So, before 7.43.0, c3 and c4 will be exported too; but that version is far too old for current curb version, so it's not handled here.
+    if Curl::CURL_VERSION.to_f > 8
+    expected_cookielist = [
+      ".127.0.0.1\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tc5\tv5",
+      ".127.0.0.1\tTRUE\t/\tFALSE\t0\tc6\tv6",
+      ".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tc1\tv1",
+      ".localhost\tTRUE\t/\tFALSE\t0\tc2\tv2",
+    ]
+    else
+    expected_cookielist = [
+      "127.0.0.1\tFALSE\t/\tFALSE\t#{expires.to_time.to_i}\tc5\tv5",
+      "127.0.0.1\tFALSE\t/\tFALSE\t0\tc6\tv6",
+      ".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tc1\tv1",
+      ".localhost\tTRUE\t/\tFALSE\t0\tc2\tv2",
+    ]
+    end
+    assert_equal expected_cookielist, easy.cookielist
+
+    easy.url = "#{TestServlet.url}/get_cookies"
+    easy.perform
+    assert_equal 'c6=v6; c5=v5; c4=v4; c3=v3', easy.body_str
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+    easy.perform
+    assert_equal 'c2=v2; c1=v1', easy.body_str
+  end
+
+  # libcurl documentation says: "This option also enables the cookie engine", but it's not tracked on the curb level
+  def test_setopt_cookielist_enables_cookie_engine
+    easy = Curl::Easy.new
+    expires = (Date.today + 2).to_datetime
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/set_cookies"
+    easy.setopt(Curl::CURLOPT_COOKIELIST, "Set-Cookie: c1=v1; domain=localhost; expires=#{expires.httpdate};")
+    easy.post_body = JSON.generate([{ name: 'c2', value: 'v2', domain: 'localhost', expires: expires.httpdate, path: '/' }])
+    easy.perform
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+    easy.post_body = nil
+    easy.perform
+
+    assert !easy.enable_cookies?
+    assert_equal [".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tc1\tv1", ".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tc2\tv2"], easy.cookielist
+    assert_equal 'c2=v2; c1=v1', easy.body_str
+  end
+
+  def test_setopt_cookielist_invalid_format
+    easy = Curl::Easy.new
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+    easy.setopt(Curl::CURLOPT_COOKIELIST, 'Not a cookie')
+    assert_nil easy.cookielist
+    easy.perform
+    assert_equal '', easy.body_str
+  end
+
+  def test_setopt_cookielist_netscape_format
+    easy = Curl::Easy.new
+    expires = (Date.today + 2).to_datetime
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+    # Note domain changes for include subdomains
+    [
+      ['localhost', 'FALSE', '/', 'TRUE', 0, 'session_http_only', '42'].join("\t"),
+      ['.localhost', 'TRUE', '/', 'FALSE', 0, 'session', '43'].join("\t"),
+      ['localhost', 'TRUE', '/', 'FALSE', expires.to_time.to_i, 'permanent', '44'].join("\t"),
+      ['.localhost', 'FALSE', '/', 'TRUE', expires.to_time.to_i, 'permanent_http_only', '45'].join("\t"),
+    ].each { |cookie| easy.setopt(Curl::CURLOPT_COOKIELIST, cookie) }
+
+    expected_cookielist = [
+      ['localhost', 'FALSE', '/', 'TRUE', 0, 'session_http_only', '42'].join("\t"),
+      ['.localhost', 'TRUE', '/', 'FALSE', 0, 'session', '43'].join("\t"),
+      ['.localhost', 'TRUE', '/', 'FALSE', expires.to_time.to_i, 'permanent', '44'].join("\t"),
+      ['localhost', 'FALSE', '/', 'TRUE', expires.to_time.to_i, 'permanent_http_only', '45'].join("\t"),
+    ]
+    assert_equal expected_cookielist, easy.cookielist
+    easy.perform
+    assert_equal 'permanent_http_only=45; session_http_only=42; permanent=44; session=43', easy.body_str
+  end
+
+  # Multiple cookies and comments are not supported
+  def test_setopt_cookielist_netscape_format_mutliline
+    easy = Curl::Easy.new
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+    easy.setopt(
+      Curl::CURLOPT_COOKIELIST,
+      [
+        '# Netscape HTTP Cookie File',
+        ['.localhost', 'TRUE', '/', 'FALSE', 0, 'session', '42'].join("\t"),
+        '',
+      ].join("\n"),
+    )
+    assert_nil easy.cookielist
+    easy.perform
+    assert_equal '', easy.body_str
+
+    easy.setopt(
+      Curl::CURLOPT_COOKIELIST,
+      [
+        ['.localhost', 'TRUE', '/', 'FALSE', 0, 'session', '42'].join("\t"),
+        ['.localhost', 'TRUE', '/', 'FALSE', 0, 'session2', '84'].join("\t"),
+        '',
+      ].join("\n"),
+    )
+    # Only first cookie is set
+    assert_equal [".localhost\tTRUE\t/\tFALSE\t0\tsession\t42"], easy.cookielist
+    easy.perform
+    assert_equal 'session=42', easy.body_str
+  end
+
+  # ALL erases all cookies held in memory
+  # ALL was added in 7.14.1
+  def test_setopt_cookielist_command_all
+    expires = (Date.today + 2).to_datetime
+    with_permanent_and_session_cookies(expires) do |easy|
+      easy.setopt(Curl::CURLOPT_COOKIELIST, 'ALL')
+      assert_nil easy.cookielist
+      easy.perform
+      assert_equal '', easy.body_str
+    end
+  end
+
+  # SESS erases all session cookies held in memory
+  # SESS was added in 7.15.4
+  def test_setopt_cookielist_command_sess
+    expires = (Date.today + 2).to_datetime
+    with_permanent_and_session_cookies(expires) do |easy|
+      easy.setopt(Curl::CURLOPT_COOKIELIST, 'SESS')
+      assert_equal [".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tpermanent\t42"], easy.cookielist
+      easy.perform
+      assert_equal 'permanent=42', easy.body_str
+    end
+  end
+
+  # FLUSH writes all known cookies to the file specified by CURLOPT_COOKIEJAR
+  # FLUSH was added in 7.17.1
+  def test_setopt_cookielist_command_flush
+    expires = (Date.today + 2).to_datetime
+    with_permanent_and_session_cookies(expires) do |easy|
+      cookiejar = File.join(Dir.tmpdir, 'curl_test_cookiejar')
+      assert !File.exist?(cookiejar)
+      begin
+        easy.cookiejar = cookiejar
+        # trick to actually set CURLOPT_COOKIEJAR
+        easy.enable_cookies = true
+        easy.perform
+        assert !File.exist?(cookiejar)
+        easy.setopt(Curl::CURLOPT_COOKIELIST, 'FLUSH')
+        expected_cookiejar = <<~COOKIEJAR
+          # Netscape HTTP Cookie File
+          # https://curl.se/docs/http-cookies.html
+          # This file was generated by libcurl! Edit at your own risk.
+          
+          .localhost	TRUE	/	FALSE	0	session	420
+          .localhost	TRUE	/	FALSE	#{expires.to_time.to_i}	permanent	42
+        COOKIEJAR
+        assert_equal expected_cookiejar, File.read(cookiejar)
+      ensure
+        # Otherwise it'll create this file again
+        easy.close
+        File.unlink(cookiejar) if File.exist?(cookiejar)
+      end
+    end
+  end
+
+  # RELOAD loads all cookies from the files specified by CURLOPT_COOKIEFILE
+  # RELOAD was added in 7.39.0
+  def test_setopt_cookielist_command_reload
+    expires = (Date.today + 2).to_datetime
+    expires_file = (Date.today + 4).to_datetime
+    with_permanent_and_session_cookies(expires) do |easy|
+      cookiefile = File.join(Dir.tmpdir, 'curl_test_cookiefile')
+      assert !File.exist?(cookiefile)
+      begin
+        cookielist = [
+          # Won't be updated, added instead
+          ".localhost\tTRUE\t/\tFALSE\t#{expires_file.to_time.to_i}\tpermanent\t84",
+          ".localhost\tTRUE\t/\tFALSE\t#{expires_file.to_time.to_i}\tpermanent_file\t84",
+          # Won't be updated, added instead
+          ".localhost\tTRUE\t/\tFALSE\t0\tsession\t840",
+          ".localhost\tTRUE\t/\tFALSE\t0\tsession_file\t840",
+          '',
+        ]
+        File.write(cookiefile, cookielist.join("\n"))
+        easy.cookiefile = cookiefile
+        # trick to actually set CURLOPT_COOKIEFILE
+        easy.enable_cookies = true
+        easy.perform
+        easy.setopt(Curl::CURLOPT_COOKIELIST, 'RELOAD')
+        expected_cookielist = [
+          ".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tpermanent\t42",
+          ".localhost\tTRUE\t/\tFALSE\t0\tsession\t420",
+          ".localhost\tTRUE\t/\tFALSE\t#{expires_file.to_time.to_i}\tpermanent\t84",
+          ".localhost\tTRUE\t/\tFALSE\t#{expires_file.to_time.to_i}\tpermanent_file\t84",
+          ".localhost\tTRUE\t/\tFALSE\t0\tsession\t840",
+          ".localhost\tTRUE\t/\tFALSE\t0\tsession_file\t840",
+        ]
+        assert_equal expected_cookielist, easy.cookielist
+        easy.perform
+        # Be careful, duplicates are not removed
+        assert_equal 'permanent_file=84; session_file=840; permanent=84; session=840; permanent=42; session=420', easy.body_str
+      ensure
+        File.unlink(cookiefile) if File.exist?(cookiefile)
+      end
+    end
+  end
+
+  def test_commands_do_not_enable_cookie_engine
+    %w[ALL SESS FLUSH RELOAD].each do |command|
+      easy = Curl::Easy.new
+      expires = (Date.today + 2).to_datetime
+      easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/set_cookies"
+      easy.setopt(Curl::CURLOPT_COOKIELIST, command)
+      easy.post_body = JSON.generate([{ name: 'c2', value: 'v2', domain: 'localhost', expires: expires.httpdate, path: '/' }])
+      easy.perform
+      easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+      easy.post_body = nil
+      easy.perform
+
+      assert !easy.enable_cookies?
+      assert_nil easy.cookielist
+      assert_equal '', easy.body_str
+    end
+  end
+
+
+  def test_strings_without_cookie_enable_cookie_engine
+    [
+      '',
+      '# Netscape HTTP Cookie File',
+      'no_a_cookie',
+    ].each do |command|
+      easy = Curl::Easy.new
+      expires = (Date.today + 2).to_datetime
+      easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/set_cookies"
+      easy.setopt(Curl::CURLOPT_COOKIELIST, command)
+      easy.post_body = JSON.generate([{ name: 'c2', value: 'v2', domain: 'localhost', expires: expires.httpdate, path: '/' }])
+      easy.perform
+      easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+      easy.post_body = nil
+      easy.perform
+
+      assert !easy.enable_cookies?
+      assert_equal [".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tc2\tv2"], easy.cookielist
+      assert_equal 'c2=v2', easy.body_str
+    end
+  end
+
+  def with_permanent_and_session_cookies(expires)
+    easy = Curl::Easy.new
+    easy.url = "http://localhost:#{TestServlet.port}#{TestServlet.path}/get_cookies"
+    easy.setopt(Curl::CURLOPT_COOKIELIST, "Set-Cookie: permanent=42; domain=localhost; expires=#{expires.httpdate};")
+    easy.setopt(Curl::CURLOPT_COOKIELIST, 'Set-Cookie: session=420; domain=localhost;')
+    assert_equal [".localhost\tTRUE\t/\tFALSE\t#{expires.to_time.to_i}\tpermanent\t42", ".localhost\tTRUE\t/\tFALSE\t0\tsession\t420"], easy.cookielist
+    easy.perform
+    assert_equal 'permanent=42; session=420', easy.body_str
+
+    yield easy
+  end
+
+  include TestServerMethods
+
+  def setup
+    server_setup
+  end
+end

data/tests/tc_curl_multi.rb

@@ -13,7 +13,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     # this test fails with libcurl 7.22.0. I didn't investigate, but it may be related
     # to CURLOPT_MAXCONNECTS bug fixed in 7.30.0:
     # https://github.com/curl/curl/commit/e87e76e2dc108efb1cae87df496416f49c55fca0
-    omit("Skip, libcurl too old (< 7.22.0)") if Curl::CURL_VERSION.split('.')[1].to_i <= 22
+    omit("Skip, libcurl too old (< 7.22.0)") if Curl::CURL_VERSION.to_f < 8 && Curl::CURL_VERSION.split('.')[1].to_i <= 22
 
     @server.shutdown if @server
     @test_thread.kill if @test_thread
@@ -114,13 +114,13 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   end
 
   def test_new_multi_01
-    d1 = ""
+    d1 = String.new
     c1 = Curl::Easy.new($TEST_URL) do |curl|
       curl.headers["User-Agent"] = "myapp-0.0"
       curl.on_body {|d| d1 << d; d.length }
     end
 
-    d2 = ""
+    d2 = String.new
     c2 = Curl::Easy.new($TEST_URL) do |curl|
       curl.headers["User-Agent"] = "myapp-0.0"
       curl.on_body {|d| d2 << d; d.length }
@@ -186,7 +186,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     rescue Curl::Err::AbortedByCallbackError => e
       did_raise = true
       in_file = e.backtrace.detect {|err| err.match?(File.basename(__FILE__)) }
-      in_file_stack = e.backtrace.select {|err| err.match?(File.basename(__FILE__)) }
+      #in_file_stack = e.backtrace.select {|err| err.match?(File.basename(__FILE__)) }
       assert_match(__FILE__, in_file)
       in_file.gsub!(__FILE__)
       parts = in_file.split(':')
@@ -206,7 +206,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     m = Curl::Multi.new
     responses = []
     n.times do|i|
-      responses[i] = ""
+      responses[i] = String.new
       c = Curl::Easy.new($TEST_URL) do|curl|
         curl.on_body{|data| responses[i] << data; data.size }
       end
@@ -230,7 +230,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     5.times do|it|
       responses = []
       n.times do|i|
-        responses[i] = ""
+        responses[i] = String.new
         c = Curl::Easy.new($TEST_URL) do|curl|
           curl.on_body{|data| responses[i] << data; data.size }
         end
@@ -376,7 +376,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     attr_reader :buf
 
     def t_method
-      @buf = ""
+      @buf = String.new
       @m = Curl::Multi.new
       10.times do|i|
         c = Curl::Easy.new($TEST_URL)
@@ -422,8 +422,8 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     m = Curl::Multi.new
     # add a few easy handles
     requests.each do |url|
-      responses[url] = ""
-      responses["#{url}-header"] = ""
+      responses[url] = String.new
+      responses["#{url}-header"] = String.new
       c = Curl::Easy.new(url) do|curl|
         curl.follow_location = true
         curl.on_header{|data| responses["#{url}-header"] << data; data.size }

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2025-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
   for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
@@ -53,7 +52,6 @@ files:
 - tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
-- tests/bug_issue277.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -67,6 +65,7 @@ files:
 - tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
+- tests/tc_curl_easy_cookielist.rb
 - tests/tc_curl_easy_resolve.rb
 - tests/tc_curl_easy_setopt.rb
 - tests/tc_curl_maxfilesize.rb
@@ -78,9 +77,8 @@ files:
 - tests/unittests.rb
 homepage: https://github.com/taf2/curb
 licenses:
-- MIT
+- Ruby
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.markdown
@@ -98,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
@@ -111,7 +108,6 @@ test_files:
 - tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
-- tests/bug_issue277.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -125,6 +121,7 @@ test_files:
 - tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
+- tests/tc_curl_easy_cookielist.rb
 - tests/tc_curl_easy_resolve.rb
 - tests/tc_curl_easy_setopt.rb
 - tests/tc_curl_maxfilesize.rb

data/tests/bug_issue277.rb

@@ -1,32 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-
-require 'curb'
-
-class BugIssue102 < Test::Unit::TestCase
-
-  def test_gc_closewait
-		100.times do
-			responses = {}
-			requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
-			m = Curl::Multi.new
-			# add a few easy handles
-			requests.each do |url|
-				responses[url] = ""
-				c = Curl::Easy.new(url) do|curl|
-					curl.follow_location = true
-					curl.on_body{|data| responses[url] << data; data.size }
-					curl.on_success {|easy| #puts "success, add more easy handles"
-          }
-				end
-				m.add(c)
-			end
-
-			m.perform do
-				#puts "idling... can do some work here"
-			end
-      GC.start
-		end
-	end
-
-end