curb 0.9.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd73a0ad8d98960321b8d523e25bad95ff25e8900e8acb187051ca40c7a1cba
-  data.tar.gz: c154996d92946fe83fa12d695b073d5026e4a55e92efd177bfad021461f2b313
+  metadata.gz: dce5f49b09bacccf705e3d25ba29031dd4fc82c2721860eef02bb4a8af2dd0e2
+  data.tar.gz: 9456ed69688f2236bdd17f338e26faaf46b91f0fd4e51b3a48d5551ff8fdc433
 SHA512:
-  metadata.gz: 48854a4f0d77befe0e81b31a3d39e826b2ef65d58d0226b617a355ba8d063ab4998853a8709ae6d2e3c4629c09ff987099398a1c884b76d95dcf956d941fc660
-  data.tar.gz: 3291675a74eb40f42d936bb65689da7d5f295e038ed019482d2cf115ba878232ce4e40aeb125d0fe786b5e82428320938ff3c75592a5c54a2d51fbe8589a0931
+  metadata.gz: df6ab81576ef567878331724c1600c59ff923be34d3a71bd31d07e4999880743e73c31a502bab8aaece54099fd5142bf954dbf004fffd38f0e6698750e3f9682
+  data.tar.gz: 5b7b867979da88d328e9f71a4a6eb7183430de26902311cb8678b443a6c53cf50aa62952f277bc2c2821bafc2af48c0e28067f7dce512ff7c2912b195bc27ad5

data/README.markdown

@@ -67,6 +67,12 @@ expand on the above instructions, please report the issue at http://github.com/t
 
 On Ubuntu, the dependencies can be satisfied by installing the following packages:
 
+18.04 and onwards
+    
+    $ sudo apt-get install libcurl4 libcurl3-gnutls libcurl4-openssl-dev
+
+< 18.04
+
     $ sudo apt-get install libcurl3 libcurl3-gnutls libcurl4-openssl-dev
 
 On RedHat:

data/Rakefile

@@ -57,22 +57,20 @@ MAKEOPTS = ENV['MAKE_OPTS'] || ''
 CURB_SO = "ext/curb_core.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
 
 file 'ext/Makefile' => 'ext/extconf.rb' do
-  Dir.chdir('ext') do
-    shell('ruby', 'extconf.rb', ENV['EXTCONF_OPTS'].to_s, live_stdout: STDOUT)
-  end
+  shell(['ruby', 'extconf.rb', ENV['EXTCONF_OPTS'].to_s],
+        { :live_stdout => STDOUT , :cwd => "#{Dir.pwd}/ext" }
+       ).error!
 end
 
 def make(target = '')
-  Dir.chdir('ext') do 
-    pid = system("#{MAKECMD} #{MAKEOPTS} #{target}")
-    $?.exitstatus
-  end    
+  shell(["#{MAKECMD}", "#{MAKEOPTS}", "#{target}"].reject(&:empty?),
+        { :live_stdout => STDOUT, :cwd => "#{Dir.pwd}/ext" }
+       ).error!
 end
 
 # Let make handle dependencies between c/o/so - we'll just run it. 
 file CURB_SO => (['ext/Makefile'] + Dir['ext/*.c'] + Dir['ext/*.h']) do
-  m = make
-  fail "Make failed (status #{m})" unless m == 0
+  make
 end
 
 desc "Compile the shared object"
@@ -80,8 +78,7 @@ task :compile => [CURB_SO]
 
 desc "Install to your site_ruby directory"
 task :install do
-  m = make 'install' 
-  fail "Make install failed (status #{m})" unless m == 0
+  make 'install'
 end
 
 # Test Tasks ---------------------------------------------------------

data/ext/curb.c

@@ -292,18 +292,26 @@ void Init_curb_core() {
 #endif
 
 #ifdef CURL_VERSION_SSL
-  rb_define_const(mCurl, "CURL_SSLVERSION_DEFAULT", LONG2NUM(CURL_SSLVERSION_DEFAULT));
+  rb_define_const(mCurl, "CURL_SSLVERSION_DEFAULT",     LONG2NUM(CURL_SSLVERSION_DEFAULT));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_DEFAULT", LONG2NUM(CURL_SSLVERSION_MAX_DEFAULT));
   rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1",   LONG2NUM(CURL_SSLVERSION_TLSv1));
   rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   LONG2NUM(CURL_SSLVERSION_SSLv2));
   rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   LONG2NUM(CURL_SSLVERSION_SSLv3));
 #if HAVE_CURL_SSLVERSION_TLSV1_0
-  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_0",   LONG2NUM(CURL_SSLVERSION_TLSv1_0));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_0",     LONG2NUM(CURL_SSLVERSION_TLSv1_0));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_0", LONG2NUM(CURL_SSLVERSION_MAX_TLSv1_0));
 #endif
 #if HAVE_CURL_SSLVERSION_TLSV1_1
-  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_1",   LONG2NUM(CURL_SSLVERSION_TLSv1_1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_1",     LONG2NUM(CURL_SSLVERSION_TLSv1_1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_1", LONG2NUM(CURL_SSLVERSION_MAX_TLSv1_1));
 #endif
 #if HAVE_CURL_SSLVERSION_TLSV1_2
-  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_2",   LONG2NUM(CURL_SSLVERSION_TLSv1_2));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_2",     LONG2NUM(CURL_SSLVERSION_TLSv1_2));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_2", LONG2NUM(CURL_SSLVERSION_MAX_TLSv1_2));
+#endif
+#if HAVE_CURL_SSLVERSION_TLSV1_3
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_3",     LONG2NUM(CURL_SSLVERSION_TLSv1_3));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_3", LONG2NUM(CURL_SSLVERSION_MAX_TLSv1_3));
 #endif
 
   rb_define_const(mCurl, "CURL_USESSL_CONTROL", LONG2NUM(CURB_FTPSSL_CONTROL));
@@ -316,13 +324,20 @@ void Init_curb_core() {
   rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   LONG2NUM(-1));
   rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   LONG2NUM(-1));
 #if HAVE_CURL_SSLVERSION_TLSv1_0
-  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_0", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_0",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_0", LONG2NUM(-1));
 #endif
 #if HAVE_CURL_SSLVERSION_TLSv1_1
-  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_1", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_1",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_1", LONG2NUM(-1));
 #endif
 #if HAVE_CURL_SSLVERSION_TLSv1_2
-  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_2", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_2",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_2", LONG2NUM(-1));
+#endif
+#if HAVE_CURL_SSLVERSION_TLSv1_3
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_3",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_3", LONG2NUM(-1));
 #endif
 
   rb_define_const(mCurl, "CURL_USESSL_CONTROL", LONG2NUM(-1));
@@ -925,12 +940,19 @@ void Init_curb_core() {
 #endif
 #if HAVE_CURL_SSLVERSION_TLSv1_0
   CURB_DEFINE(CURL_SSLVERSION_TLSv1_0);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_0);
 #endif
 #if HAVE_CURL_SSLVERSION_TLSv1_1
   CURB_DEFINE(CURL_SSLVERSION_TLSv1_1);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_1);
 #endif
 #if HAVE_CURL_SSLVERSION_TLSv1_2
   CURB_DEFINE(CURL_SSLVERSION_TLSv1_2);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_2);
+#endif
+#if HAVE_CURL_SSLVERSION_TLSv1_3
+  CURB_DEFINE(CURL_SSLVERSION_TLSv1_3);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_3);
 #endif
 #if HAVE_CURLOPT_SSL_VERIFYPEER
   CURB_DEFINE(CURLOPT_SSL_VERIFYPEER);
@@ -1050,6 +1072,122 @@ void Init_curb_core() {
   CURB_DEFINE(CURLOPT_HAPROXYPROTOCOL);
 #endif
 
+#if HAVE_CURLPROTO_RTMPTE
+  CURB_DEFINE(CURLPROTO_RTMPTE);
+#endif
+
+#if HAVE_CURLPROTO_RTMPTS
+  CURB_DEFINE(CURLPROTO_RTMPTS);
+#endif
+
+#if HAVE_CURLPROTO_SMBS
+  CURB_DEFINE(CURLPROTO_SMBS);
+#endif
+
+#if HAVE_CURLPROTO_LDAP
+  CURB_DEFINE(CURLPROTO_LDAP);
+#endif
+
+#if HAVE_CURLPROTO_FTP
+  CURB_DEFINE(CURLPROTO_FTP);
+#endif
+
+#if HAVE_CURLPROTO_SMTPS
+  CURB_DEFINE(CURLPROTO_SMTPS);
+#endif
+
+#if HAVE_CURLPROTO_HTTP
+  CURB_DEFINE(CURLPROTO_HTTP);
+#endif
+
+#if HAVE_CURLPROTO_SMTP
+  CURB_DEFINE(CURLPROTO_SMTP);
+#endif
+
+#if HAVE_CURLPROTO_TFTP
+  CURB_DEFINE(CURLPROTO_TFTP);
+#endif
+
+#if HAVE_CURLPROTO_LDAPS
+  CURB_DEFINE(CURLPROTO_LDAPS);
+#endif
+
+#if HAVE_CURLPROTO_IMAPS
+  CURB_DEFINE(CURLPROTO_IMAPS);
+#endif
+
+#if HAVE_CURLPROTO_SCP
+  CURB_DEFINE(CURLPROTO_SCP);
+#endif
+
+#if HAVE_CURLPROTO_SFTP
+  CURB_DEFINE(CURLPROTO_SFTP);
+#endif
+
+#if HAVE_CURLPROTO_TELNET
+  CURB_DEFINE(CURLPROTO_TELNET);
+#endif
+
+#if HAVE_CURLPROTO_FILE
+  CURB_DEFINE(CURLPROTO_FILE);
+#endif
+
+#if HAVE_CURLPROTO_FTPS
+  CURB_DEFINE(CURLPROTO_FTPS);
+#endif
+
+#if HAVE_CURLPROTO_HTTPS
+  CURB_DEFINE(CURLPROTO_HTTPS);
+#endif
+
+#if HAVE_CURLPROTO_IMAP
+  CURB_DEFINE(CURLPROTO_IMAP);
+#endif
+
+#if HAVE_CURLPROTO_POP3
+  CURB_DEFINE(CURLPROTO_POP3);
+#endif
+
+#if HAVE_CURLPROTO_GOPHER
+  CURB_DEFINE(CURLPROTO_GOPHER);
+#endif
+
+#if HAVE_CURLPROTO_DICT
+  CURB_DEFINE(CURLPROTO_DICT);
+#endif
+
+#if HAVE_CURLPROTO_SMB
+  CURB_DEFINE(CURLPROTO_SMB);
+#endif
+
+#if HAVE_CURLPROTO_RTMP
+  CURB_DEFINE(CURLPROTO_RTMP);
+#endif
+
+#if HAVE_CURLPROTO_ALL
+  CURB_DEFINE(CURLPROTO_ALL);
+#endif
+
+#if HAVE_CURLPROTO_RTMPE
+  CURB_DEFINE(CURLPROTO_RTMPE);
+#endif
+
+#if HAVE_CURLPROTO_RTMPS
+  CURB_DEFINE(CURLPROTO_RTMPS);
+#endif
+
+#if HAVE_CURLPROTO_RTMPT
+  CURB_DEFINE(CURLPROTO_RTMPT);
+#endif
+
+#if HAVE_CURLPROTO_POP3S
+  CURB_DEFINE(CURLPROTO_POP3S);
+#endif
+
+#if HAVE_CURLPROTO_RTSP
+  CURB_DEFINE(CURLPROTO_RTSP);
+#endif
+
 #if LIBCURL_VERSION_NUM >= 0x072B00 /* 7.43.0 */
   CURB_DEFINE(CURLPIPE_NOTHING);
   CURB_DEFINE(CURLPIPE_HTTP1);

data/ext/curb.h

@@ -28,11 +28,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.9.11"
-#define CURB_VER_NUM   9011
-#define CURB_VER_MAJ   0
-#define CURB_VER_MIN   9
-#define CURB_VER_MIC   11
+#define CURB_VERSION   "1.0.0"
+#define CURB_VER_NUM   1000
+#define CURB_VER_MAJ   1
+#define CURB_VER_MIN   0
+#define CURB_VER_MIC   0
 #define CURB_VER_PATCH 0
 
 
@@ -49,6 +49,11 @@
   #define RHASH_SIZE(hash) RHASH(hash)->tbl->num_entries
 #endif
 
+// ruby 1.8 does not provide the macro
+#ifndef DBL2NUM
+  #define DBL2NUM(dbl) rb_float_new(dbl)
+#endif
+
 extern VALUE mCurl;
 
 extern void Init_curb_core();

data/ext/curb_easy.c

@@ -268,6 +268,8 @@ void curl_easy_free(ruby_curl_easy *rbce) {
 static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->opts = rb_hash_new();
 
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   rbce->curl_headers = NULL;
   rbce->curl_proxy_headers = NULL;
   rbce->curl_ftp_commands = NULL;
@@ -355,8 +357,9 @@ static VALUE ruby_curl_easy_initialize(int argc, VALUE *argv, VALUE self) {
 
   ruby_curl_easy_zero(rbce);
 
-  rb_easy_set("url", url);
+  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
 
+  rb_easy_set("url", url);
 
   /* set the pointer to the curl handle */
   ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)self);
@@ -392,6 +395,8 @@ static VALUE ruby_curl_easy_clone(VALUE self) {
   newrbce->curl_ftp_commands = NULL;
   newrbce->curl_resolve = NULL;
 
+  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
+
   return Data_Wrap_Struct(cCurlEasy, curl_easy_mark, curl_easy_free, newrbce);
 }
 
@@ -461,7 +466,9 @@ static VALUE ruby_curl_easy_reset(VALUE self) {
   curl_easy_reset(rbce->curl);
   ruby_curl_easy_zero(rbce);
 
-  /* rest clobbers the private setting, so reset it to self */
+  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, &rbce->err_buf);
+
+  /* reset clobbers the private setting, so reset it to self */
   ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)self);
   if (ecode != CURLE_OK) {
     raise_curl_easy_error_exception(ecode);
@@ -1539,6 +1546,7 @@ static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
  *   Curl::CURL_SSLVERSION_TLSv1_0
  *   Curl::CURL_SSLVERSION_TLSv1_1
  *   Curl::CURL_SSLVERSION_TLSv1_2
+ *   Curl::CURL_SSLVERSION_TLSv1_3
  */
 static VALUE ruby_curl_easy_ssl_version_set(VALUE self, VALUE ssl_version) {
   CURB_IMMED_SETTER(ruby_curl_easy, ssl_version, -1);
@@ -2607,6 +2615,8 @@ static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, verb);
 
   retval = rb_funcall(self, rb_intern("perform"), 0);
@@ -2672,6 +2682,8 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
+  memset(rbce->err_buf, 0, sizeof(rbce->err_buf));
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
 
   if (rbce->multipart_form_post) {
@@ -2743,6 +2755,8 @@ 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));
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
 
@@ -2955,7 +2969,7 @@ static VALUE ruby_curl_easy_connect_time_get(VALUE self) {
  * Retrieve the time, in seconds, it took from the start until the SSL/SSH
  * connect/handshake to the remote host was completed. This time is most often
  * very near to the pre transfer time, except for cases such as HTTP
- * pippelining where the pretransfer time can be delayed due to waits in line
+ * pipelining where the pretransfer time can be delayed due to waits in line
  * for the pipeline and more.
  */
 #if defined(HAVE_CURLINFO_APPCONNECT_TIME)
@@ -3448,6 +3462,21 @@ static VALUE ruby_curl_easy_last_result(VALUE self) {
   return LONG2NUM(rbce->last_result);
 }
 
+/*
+ * call-seq:
+ *   easy.last_error                                     => "Error details" or nil
+ */
+static VALUE ruby_curl_easy_last_error(VALUE self) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (rbce->err_buf[0]) {    // curl returns NULL or empty string if none
+    return rb_str_new2(rbce->err_buf);
+  } else {
+    return Qnil;
+  }
+}
+
 /*
  * call-seq:
  *   easy.setopt Fixnum, value  => value
@@ -3546,6 +3575,9 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   case CURLOPT_TCP_NODELAY: {
     curl_easy_setopt(rbce->curl, CURLOPT_TCP_NODELAY, NUM2LONG(val));
     } break;
+  case CURLOPT_RANGE: {
+    curl_easy_setopt(rbce->curl, CURLOPT_RANGE, StringValueCStr(val));
+    } break;
   case CURLOPT_RESUME_FROM: {
     curl_easy_setopt(rbce->curl, CURLOPT_RESUME_FROM, NUM2LONG(val));
     } break;
@@ -3606,6 +3638,15 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     GetOpenFile(val, open_f_ptr);
     curl_easy_setopt(rbce->curl, CURLOPT_STDERR, rb_io_stdio_file(open_f_ptr));
     break;
+  case CURLOPT_PROTOCOLS:
+  case CURLOPT_REDIR_PROTOCOLS:
+    curl_easy_setopt(rbce->curl, option, NUM2LONG(val));
+    break;
+#if HAVE_CURLOPT_SSL_SESSIONID_CACHE
+  case CURLOPT_SSL_SESSIONID_CACHE:
+    curl_easy_setopt(rbce->curl, CURLOPT_SSL_SESSIONID_CACHE, NUM2LONG(val));
+    break;
+#endif
   default:
     rb_raise(rb_eTypeError, "Curb unsupported option");
   }
@@ -3913,6 +3954,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "multi", ruby_curl_easy_multi_get, 0);
   rb_define_method(cCurlEasy, "multi=", ruby_curl_easy_multi_set, 1);
   rb_define_method(cCurlEasy, "last_result", ruby_curl_easy_last_result, 0);
+  rb_define_method(cCurlEasy, "last_error", ruby_curl_easy_last_error, 0);
 
   rb_define_method(cCurlEasy, "setopt", ruby_curl_easy_set_opt, 2);
   rb_define_method(cCurlEasy, "getinfo", ruby_curl_easy_get_opt, 1);

data/ext/curb_easy.h

@@ -36,6 +36,9 @@ typedef struct {
   /* The handler */
   CURL *curl;
 
+  /* Buffer for error details from CURLOPT_ERRORBUFFER */
+  char err_buf[CURL_ERROR_SIZE];
+
   VALUE opts; /* rather then allocate everything we might need to store, allocate a Hash and only store objects we actually use... */
   VALUE multi; /* keep a multi handle alive for each easy handle not being used by a multi handle.  This improves easy performance when not within a multi context */
 

data/ext/extconf.rb

@@ -18,6 +18,8 @@ elsif !have_library('curl') or !have_header('curl/curl.h')
   fail <<-EOM
   Can't find libcurl or curl/curl.h
 
+  Make sure development libs (ie libcurl4-openssl-dev) are installed on the system.
+
   Try passing --with-curl-dir or --with-curl-lib and --with-curl-include
   options to extconf.
   EOM
@@ -341,6 +343,9 @@ have_constant :CURL_SSLVERSION_TLSv1_0
 have_constant :CURL_SSLVERSION_TLSv1_1
 have_constant :CURL_SSLVERSION_TLSv1_2
 
+# Added in 7.52.0
+have_constant :CURL_SSLVERSION_TLSv1_3
+
 have_constant "curlopt_ssl_verifypeer"
 have_constant "curlopt_cainfo"
 have_constant "curlopt_issuercert"
@@ -400,6 +405,37 @@ have_constant "curlopt_path_as_is"
 # added in 7.43.0
 have_constant "curlopt_pipewait"
 
+# protocol constants
+have_constant "curlproto_all"
+have_constant "curlproto_dict"
+have_constant "curlproto_file"
+have_constant "curlproto_ftp"
+have_constant "curlproto_ftps"
+have_constant "curlproto_gopher"
+have_constant "curlproto_http"
+have_constant "curlproto_https"
+have_constant "curlproto_imap"
+have_constant "curlproto_imaps"
+have_constant "curlproto_ldap"
+have_constant "curlproto_ldaps"
+have_constant "curlproto_pop3"
+have_constant "curlproto_pop3s"
+have_constant "curlproto_rtmp"
+have_constant "curlproto_rtmpe"
+have_constant "curlproto_rtmps"
+have_constant "curlproto_rtmpt"
+have_constant "curlproto_rtmpte"
+have_constant "curlproto_rtmpts"
+have_constant "curlproto_rtsp"
+have_constant "curlproto_scp"
+have_constant "curlproto_sftp"
+have_constant "curlproto_smb"
+have_constant "curlproto_smbs"
+have_constant "curlproto_smtp"
+have_constant "curlproto_smtps"
+have_constant "curlproto_telnet"
+have_constant "curlproto_tftp"
+
 if try_compile('int main() { return 0; }','-Wall')
   $CFLAGS << ' -Wall'
 end

data/lib/curl/easy.rb

@@ -75,8 +75,9 @@ module Curl
       end
 
       if self.last_result != 0 && self.on_failure.nil?
-        error = Curl::Easy.error(self.last_result)
-        raise error.first.new(self.head)
+        (err_class, err_summary) = Curl::Easy.error(self.last_result)
+        err_detail = self.last_error
+        raise err_class.new([err_summary, err_detail].compact.join(": "))
       end
 
       ret

data/tests/helper.rb

@@ -143,7 +143,6 @@ module TestServerMethods
   def server_setup(port=9129,servlet=TestServlet)
     @__port = port
     if (@server ||= nil).nil? and !File.exist?(locked_file)
-
       File.open(locked_file,'w') {|f| f << 'locked' }
       if TEST_SINGLE_THREADED
         rd, wr = IO.pipe

data/tests/tc_curl_easy.rb

@@ -21,7 +21,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     end
     output = File.read(path)
 
-    assert_match('HTTP/1.1 200 OK ', output)
+    assert_match(/HTTP\/1\.1\ 200\ OK(?:\ )?/, output)
     assert_match('Host: 127.0.0.1:9129', output)
   end
 

data/tests/tc_curl_multi.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'set'
 
 class TestCurbCurlMulti < Test::Unit::TestCase
   def teardown
@@ -9,20 +10,58 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   # for https://github.com/taf2/curb/issues/277
   # must connect to an external
   def test_connection_keepalive
-    # 0123456 default & reserved RubyVM. It will probably include 7 from Dir.glob
-    lsof=`/usr/bin/which lsof`.strip
-    open_fds = lambda do 
-      `#{lsof} -p #{Process.pid} | egrep "TCP|UDP" | wc -l`.strip.to_i
+    # 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
+
+    @server.shutdown if @server
+    @test_thread.kill if @test_thread
+    @server = nil
+    File.unlink(locked_file)
+    Curl::Multi.autoclose = true
+    assert Curl::Multi.autoclose
+# XXX: thought maybe we can clean house here to have the full suite pass in osx... but for now running this test in isolate does pass
+#      additionally, if ss allows this to pass on linux without requesting google i think this is a good trade off... leaving some of the thoughts below
+#      in hopes that coming back to this later will find it and remember how to fix it
+#    types = Set.new
+#    close_types = Set.new([TCPServer,TCPSocket,Socket,Curl::Multi, Curl::Easy,WEBrick::Log])
+#    ObjectSpace.each_object {|o|
+#      if o.respond_to?(:close)
+#        types << o.class
+#      end
+#      if close_types.include?(o.class)
+#        o.close
+#      end
+#    }
+    #puts "unique types: #{types.to_a.join("\n")}"
+    GC.start # cleanup FDs left over from other tests
+    server_setup
+    GC.start # cleanup FDs left over from other tests
+
+    if `which ss`.strip.size == 0
+      # osx need lsof still :(
+      open_fds = lambda do
+        out = `/usr/sbin/lsof -p #{Process.pid} | egrep "TCP|UDP"`# | egrep ':#{TestServlet.port} ' | egrep ESTABLISHED`# | wc -l`.strip.to_i
+        #puts out.lines.join("\n")
+        out.lines.size
+      end
+    else
+      ss = `which ss`.strip
+      open_fds = lambda do
+        `#{ss} -n4 state established dport = :#{TestServlet.port} | wc -l`.strip.to_i
+      end
     end
+    Curl::Multi.autoclose = false
     before_open = open_fds.call
+    #puts "before_open: #{before_open.inspect}"
     assert !Curl::Multi.autoclose
     multi = Curl::Multi.new
     multi.max_connects = 1 # limit to 1 connection within the multi handle
 
     did_complete = false
     5.times do |n|
-      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
-      easy = Curl::Easy.new("http://google.com/") do |curl|
+      easy = Curl::Easy.new(TestServlet.url) do |curl|
         curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
         curl.on_complete {
           did_complete = true
@@ -34,18 +73,19 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     multi.perform
     assert did_complete
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 1, "with max connections set to 1 at this point the connection to google should still be open"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 1, (after_open - before_open), "with max connections set to 1 at this point the connection to google should still be open"
     multi.close
 
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 0, "after closing the multi handle all connections should be closed"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 0, (after_open - before_open), "after closing the multi handle all connections should be closed"
 
     Curl::Multi.autoclose = true
     multi = Curl::Multi.new
     did_complete = false
     5.times do |n|
-      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
-      easy = Curl::Easy.new("http://google.com/") do |curl|
+      easy = Curl::Easy.new(TestServlet.url) do |curl|
         curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
         curl.on_complete {
           did_complete = true
@@ -57,7 +97,8 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     multi.perform
     assert did_complete
     after_open = open_fds.call
-    assert_equal (after_open - before_open), 0, "auto close the connections"
+    #puts "after_open: #{after_open} before_open: #{before_open.inspect}"
+    assert_equal 0, (after_open - before_open), "auto close the connections"
   ensure
     Curl::Multi.autoclose = false # restore default
   end

data/tests/tc_curl_protocols.rb

@@ -0,0 +1,37 @@
+class TestCurbCurlProtocols < Test::Unit::TestCase
+  include TestServerMethods
+
+  def setup
+    @easy = Curl::Easy.new
+    @easy.set :protocols, Curl::CURLPROTO_HTTP | Curl::CURLPROTO_HTTPS
+    @easy.follow_location = true
+    server_setup
+  end
+
+  def test_protocol_allowed
+    @easy.set :url, "http://127.0.0.1:9129/this_file_does_not_exist.html"
+    @easy.perform
+    assert_equal 404, @easy.response_code
+  end
+
+  def test_protocol_denied
+    @easy.set :url, "gopher://google.com/"
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      @easy.perform
+    end
+  end
+
+  def test_redir_protocol_allowed
+    @easy.set :url, TestServlet.url + "/redirect"
+    @easy.set :redir_protocols, Curl::CURLPROTO_HTTP
+    @easy.perform
+  end
+
+  def test_redir_protocol_denied
+    @easy.set :url, TestServlet.url + "/redirect"
+    @easy.set :redir_protocols, Curl::CURLPROTO_HTTPS
+    assert_raises Curl::Err::UnsupportedProtocolError do
+      @easy.perform
+    end
+  end
+end

data/tests/timeout.rb

@@ -17,9 +17,13 @@ class TestCurbTimeouts < Test::Unit::TestCase
   def test_overall_timeout_on_dead_transfer
     curl = Curl::Easy.new(wait_url(2))
     curl.timeout = 1
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation timed out after/,
+      exception.message
+    )
   end
 
   def test_overall_timeout_ms_on_dead_transfer
@@ -44,16 +48,20 @@ class TestCurbTimeouts < Test::Unit::TestCase
     curl = Curl::Easy.new(serve_url(100, 2, 3))
     curl.timeout = 1
     # transfer is aborted despite data being exchanged
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation timed out after/,
+      exception.message
+    )
   end
   
   def test_low_speed_time_on_slow_transfer
     curl = Curl::Easy.new(serve_url(100, 1, 3))
     curl.low_speed_time = 2
     # use default low_speed_limit of 1
-    assert true, curl.http_get
+    assert_equal true, curl.http_get
   end
   
   def test_low_speed_time_on_very_slow_transfer
@@ -63,18 +71,26 @@ class TestCurbTimeouts < Test::Unit::TestCase
     # XXX for some reason this test fails if low speed limit is not specified
     curl.low_speed_limit = 1
     # use default low_speed_limit of 1
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation too slow/,
+      exception.message
+    )
   end
   
   def test_low_speed_limit_on_slow_transfer
     curl = Curl::Easy.new(serve_url(10, 1, 3))
     curl.low_speed_time = 2
     curl.low_speed_limit = 1000
-    assert_raise(Curl::Err::TimeoutError) do
+    exception = assert_raise(Curl::Err::TimeoutError) do
       curl.http_get
     end
+    assert_match(
+      /^Timeout was reached: Operation too slow/,
+      exception.message
+    )
   end
   
   def test_clearing_low_speed_time

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2022-01-14 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
@@ -52,7 +52,6 @@ files:
 - tests/bug_curb_easy_post_with_string_no_content_length_header.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
@@ -70,6 +69,7 @@ files:
 - tests/tc_curl_maxfilesize.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
+- tests/tc_curl_protocols.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
@@ -77,7 +77,7 @@ homepage: https://github.com/taf2/curb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--main"
 - README.markdown
@@ -95,36 +95,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.3.3
+signing_key: 
 specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
-- tests/tc_curl_multi.rb
 - tests/alltests.rb
-- tests/tc_curl_easy_setopt.rb
-- tests/tc_curl.rb
-- tests/bug_postfields_crash.rb
-- tests/bug_crash_on_progress.rb
-- tests/helper.rb
-- tests/bug_issue277.rb
-- tests/bug_postfields_crash2.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/timeout.rb
 - tests/bug_crash_on_debug.rb
-- tests/unittests.rb
-- tests/bug_issue102.rb
+- tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_multi_segfault.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
+- tests/bug_issue102.rb
+- tests/bug_multi_segfault.rb
+- tests/bug_postfields_crash.rb
+- tests/bug_postfields_crash2.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/bugtests.rb
+- tests/helper.rb
+- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
-- tests/timeout_server.rb
+- tests/signals.rb
+- tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/mem_check.rb
-- tests/tc_curl_postfield.rb
-- tests/tc_curl_maxfilesize.rb
-- tests/bugtests.rb
 - tests/tc_curl_easy_resolve.rb
-- tests/signals.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/tc_curl_easy_setopt.rb
+- tests/tc_curl_maxfilesize.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/tc_curl_protocols.rb
+- tests/timeout.rb
+- tests/timeout_server.rb
+- tests/unittests.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