curb 0.1.4 → 0.7.15

data/ext/curb.c

@@ -1,10 +1,10 @@
 /* Curb - Libcurl(3) bindings for Ruby.
- * Copyright (c)2006 Ross Bamford. 
+ * Copyright (c)2006 Ross Bamford.
  * Licensed under the Ruby License. See LICENSE for details.
- * 
+ *
  * $Id: curb.c 35 2006-12-23 15:22:19Z roscopeco $
  */
- 
+
 #include "curb.h"
 
 VALUE mCurl;
@@ -14,36 +14,36 @@ VALUE mCurl;
 /*
  * call-seq:
  *   Curl.ipv6?                                       => true or false
- * 
- * Returns true if the installed libcurl supports IPv6. 
+ *
+ * Returns true if the installed libcurl supports IPv6.
  */
 static VALUE ruby_curl_ipv6_q(VALUE mod) {
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_IPV6) ? Qtrue : Qfalse);
 }
 
 /*
  * call-seq:
  *   Curl.kerberos4?                                  => true or false
- * 
+ *
  * Returns true if the installed libcurl supports Kerberos4 authentication
- * with FTP connections. 
+ * with FTP connections.
  */
 static VALUE ruby_curl_kerberos4_q(VALUE mod) {
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_KERBEROS4) ? Qtrue : Qfalse);
 }
 
 /*
  * call-seq:
  *   Curl.ssl?                                        => true or false
- * 
+ *
  * Returns true if the installed libcurl supports SSL connections.
  * For libcurl versions < 7.10, always returns false.
  */
 static VALUE ruby_curl_ssl_q(VALUE mod) {
-#ifdef CURL_VERSION_SSL
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_SSL
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_SSL) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -53,13 +53,13 @@ static VALUE ruby_curl_ssl_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.libz?                                       => true or false
- * 
+ *
  * Returns true if the installed libcurl supports HTTP deflate
  * using libz. For libcurl versions < 7.10, always returns false.
  */
 static VALUE ruby_curl_libz_q(VALUE mod) {
-#ifdef CURL_VERSION_LIBZ
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_LIBZ
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_LIBZ) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -69,13 +69,13 @@ static VALUE ruby_curl_libz_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.ntlm?                                       => true or false
- * 
+ *
  * Returns true if the installed libcurl supports HTTP NTLM.
  * For libcurl versions < 7.10.6, always returns false.
  */
 static VALUE ruby_curl_ntlm_q(VALUE mod) {
-#ifdef CURL_VERSION_NTLM
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_NTLM
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_NTLM) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -85,13 +85,13 @@ static VALUE ruby_curl_ntlm_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.gssnegotiate?                               => true or false
- * 
+ *
  * Returns true if the installed libcurl supports HTTP GSS-Negotiate.
  * For libcurl versions < 7.10.6, always returns false.
  */
 static VALUE ruby_curl_gssnegotiate_q(VALUE mod) {
-#ifdef CURL_VERSION_GSSNEGOTIATE
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_GSSNEGOTIATE
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_GSSNEGOTIATE) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -101,14 +101,14 @@ static VALUE ruby_curl_gssnegotiate_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.debug?                                      => true or false
- * 
- * Returns true if the installed libcurl was built with extra debug 
+ *
+ * Returns true if the installed libcurl was built with extra debug
  * capabilities built-in. For libcurl versions < 7.10.6, always returns
  * false.
  */
 static VALUE ruby_curl_debug_q(VALUE mod) {
-#ifdef CURL_VERSION_DEBUG
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_DEBUG
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_DEBUG) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -118,15 +118,15 @@ static VALUE ruby_curl_debug_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.asyncdns?                                   => true or false
- * 
+ *
  * Returns true if the installed libcurl was built with support for
  * asynchronous name lookups, which allows more exact timeouts (even
  * on Windows) and less blocking when using the multi interface.
  * For libcurl versions < 7.10.7, always returns false.
  */
 static VALUE ruby_curl_asyncdns_q(VALUE mod) {
-#ifdef CURL_VERSION_ASYNCHDNS
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_ASYNCHDNS
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_ASYNCHDNS) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -136,14 +136,14 @@ static VALUE ruby_curl_asyncdns_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.spnego?                                     => true or false
- * 
+ *
  * Returns true if the installed libcurl was built with support for SPNEGO
  * authentication (Simple and Protected GSS-API Negotiation Mechanism, defined
  * in RFC 2478). For libcurl versions < 7.10.8, always returns false.
  */
 static VALUE ruby_curl_spnego_q(VALUE mod) {
-#ifdef CURL_VERSION_SPNEGO
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_SPNEGO
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_SPNEGO) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -153,13 +153,13 @@ static VALUE ruby_curl_spnego_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.largefile?                                  => true or false
- * 
+ *
  * Returns true if the installed libcurl was built with support for large
  * files. For libcurl versions < 7.11.1, always returns false.
  */
 static VALUE ruby_curl_largefile_q(VALUE mod) {
-#ifdef CURL_VERSION_LARGEFILE
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_LARGEFILE
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_LARGEFILE) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -169,14 +169,14 @@ static VALUE ruby_curl_largefile_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.idn?                                        => true or false
- * 
- * Returns true if the installed libcurl was built with support for IDNA, 
- * domain names with international letters. For libcurl versions < 7.12.0, 
+ *
+ * Returns true if the installed libcurl was built with support for IDNA,
+ * domain names with international letters. For libcurl versions < 7.12.0,
  * always returns false.
  */
 static VALUE ruby_curl_idn_q(VALUE mod) {
-#ifdef CURL_VERSION_IDN
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_IDN
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_IDN) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -186,16 +186,16 @@ static VALUE ruby_curl_idn_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.sspi?                                       => true or false
- * 
+ *
  * Returns true if the installed libcurl was built with support for SSPI.
  * This is only available on Windows and makes libcurl use Windows-provided
  * functions for NTLM authentication. It also allows libcurl to use the current
- * user and the current user's password without the app having to pass them on. 
+ * user and the current user's password without the app having to pass them on.
  * For libcurl versions < 7.13.2, always returns false.
  */
 static VALUE ruby_curl_sspi_q(VALUE mod) {
-#ifdef CURL_VERSION_SSPI
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_SSPI
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_SSPI) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -205,13 +205,13 @@ static VALUE ruby_curl_sspi_q(VALUE mod) {
 /*
  * call-seq:
  *   Curl.conv?                                       => true or false
- * 
- * Returns true if the installed libcurl was built with support for character 
+ *
+ * Returns true if the installed libcurl was built with support for character
  * conversions. For libcurl versions < 7.15.4, always returns false.
  */
 static VALUE ruby_curl_conv_q(VALUE mod) {
-#ifdef CURL_VERSION_CONV
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);  
+#ifdef HAVE_CURL_VERSION_CONV
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
   return((ver->features & CURL_VERSION_CONV) ? Qtrue : Qfalse);
 #else
   return Qfalse;
@@ -220,102 +220,138 @@ static VALUE ruby_curl_conv_q(VALUE mod) {
 
 void Init_curb_core() {
   // TODO we need to call curl_global_cleanup at exit!
-  curl_global_init(CURL_GLOBAL_ALL);
-  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
+  curl_version_info_data *ver;
   VALUE curlver, curllongver, curlvernum;
 
-  mCurl = rb_define_module("Curl");  
-  
+  curl_global_init(CURL_GLOBAL_ALL);
+  ver = curl_version_info(CURLVERSION_NOW);
+
+  mCurl = rb_define_module("Curl");
+
   curlver = rb_str_new2(ver->version);
   curllongver = rb_str_new2(curl_version());
   curlvernum = LONG2NUM(LIBCURL_VERSION_NUM);
-  
-  rb_define_const(mCurl, "CURB_VERSION", rb_str_new2(CURB_VERSION));    
+
+  rb_define_const(mCurl, "CURB_VERSION", rb_str_new2(CURB_VERSION));
   rb_define_const(mCurl, "VERSION", curlver);
   rb_define_const(mCurl, "CURL_VERSION", curlver);
   rb_define_const(mCurl, "VERNUM", curlvernum);
   rb_define_const(mCurl, "CURL_VERNUM", curlvernum);
-  rb_define_const(mCurl, "LONG_VERSION", curllongver);  
-  rb_define_const(mCurl, "CURL_LONG_VERSION", curllongver);  
+  rb_define_const(mCurl, "LONG_VERSION", curllongver);
+  rb_define_const(mCurl, "CURL_LONG_VERSION", curllongver);
 
   /* Passed to on_debug handler to indicate that the data is informational text. */
   rb_define_const(mCurl, "CURLINFO_TEXT", INT2FIX(CURLINFO_TEXT));
-  
+
   /* Passed to on_debug handler to indicate that the data is header (or header-like) data received from the peer. */
   rb_define_const(mCurl, "CURLINFO_HEADER_IN", INT2FIX(CURLINFO_HEADER_IN));
-  
+
   /* Passed to on_debug handler to indicate that the data is header (or header-like) data sent to the peer. */
   rb_define_const(mCurl, "CURLINFO_HEADER_OUT", INT2FIX(CURLINFO_HEADER_OUT));
-  
+
   /* Passed to on_debug handler to indicate that the data is protocol data received from the peer. */
   rb_define_const(mCurl, "CURLINFO_DATA_IN", INT2FIX(CURLINFO_DATA_IN));
-  
+
   /* Passed to on_debug handler to indicate that the data is protocol data sent to the peer. */
   rb_define_const(mCurl, "CURLINFO_DATA_OUT", INT2FIX(CURLINFO_DATA_OUT));
 
+#ifdef HAVE_CURLFTPMETHOD_MULTICWD 
+  rb_define_const(mCurl, "CURL_MULTICWD",  INT2FIX(CURLFTPMETHOD_MULTICWD));
+#endif
+
+#ifdef HAVE_CURLFTPMETHOD_NOCWD 
+  rb_define_const(mCurl, "CURL_NOCWD",     INT2FIX(CURLFTPMETHOD_NOCWD));
+#endif
+
+#ifdef HAVE_CURLFTPMETHOD_SINGLECWD 
+  rb_define_const(mCurl, "CURL_SINGLECWD", INT2FIX(CURLFTPMETHOD_SINGLECWD));
+#endif
+
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is an HTTP proxy. (libcurl >= 7.10) */
-#ifdef CURLPROXY_HTTP
+#ifdef HAVE_CURLPROXY_HTTP
   rb_define_const(mCurl, "CURLPROXY_HTTP", INT2FIX(CURLPROXY_HTTP));
 #else
   rb_define_const(mCurl, "CURLPROXY_HTTP", INT2FIX(-1));
 #endif
 
+#ifdef CURL_VERSION_SSL
+  rb_define_const(mCurl, "CURL_SSLVERSION_DEFAULT", INT2FIX(CURL_SSLVERSION_DEFAULT));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1",   INT2FIX(CURL_SSLVERSION_TLSv1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   INT2FIX(CURL_SSLVERSION_SSLv2));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   INT2FIX(CURL_SSLVERSION_SSLv3));
+
+  rb_define_const(mCurl, "CURL_USESSL_CONTROL", INT2FIX(CURB_FTPSSL_CONTROL));
+  rb_define_const(mCurl, "CURL_USESSL_NONE", INT2FIX(CURB_FTPSSL_NONE));
+  rb_define_const(mCurl, "CURL_USESSL_TRY", INT2FIX(CURB_FTPSSL_TRY));
+  rb_define_const(mCurl, "CURL_USESSL_ALL", INT2FIX(CURB_FTPSSL_ALL));
+#else
+  rb_define_const(mCurl, "CURL_SSLVERSION_DEFAULT", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1",   INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   INT2FIX(-1));
+
+  rb_define_const(mCurl, "CURL_USESSL_CONTROL", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_USESSL_NONE", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_USESSL_TRY", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_USESSL_ALL", INT2FIX(-1));
+#endif
+
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS4 proxy. (libcurl >= 7.15.2) */
-#ifdef CURLPROXY_SOCKS4  
+#ifdef HAVE_CURLPROXY_SOCKS4
   rb_define_const(mCurl, "CURLPROXY_SOCKS4", INT2FIX(CURLPROXY_SOCKS4));
 #else
   rb_define_const(mCurl, "CURLPROXY_SOCKS4", INT2FIX(-2));
 #endif
 
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS5 proxy. (libcurl >= 7.10) */
-#ifdef CURLPROXY_SOCKS5    
+#ifdef HAVE_CURLPROXY_SOCKS5
   rb_define_const(mCurl, "CURLPROXY_SOCKS5", INT2FIX(CURLPROXY_SOCKS5));
 #else
   rb_define_const(mCurl, "CURLPROXY_SOCKS5", INT2FIX(-2));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use Basic authentication. */
-#ifdef CURLAUTH_BASIC
+#ifdef HAVE_CURLAUTH_BASIC
   rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(CURLAUTH_BASIC));
 #else
-  rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(0);
+  rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(0));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use Digest authentication. */
-#ifdef CURLAUTH_DIGEST
+#ifdef HAVE_CURLAUTH_DIGEST
   rb_define_const(mCurl, "CURLAUTH_DIGEST", INT2FIX(CURLAUTH_DIGEST));
 #else
   rb_define_const(mCurl, "CURLAUTH_DIGEST", INT2FIX(0));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use GSS Negotiate authentication. Requires a suitable GSS-API library. */
-#ifdef CURLAUTH_GSSNEGOTIATE
+#ifdef HAVE_CURLAUTH_GSSNEGOTIATE
   rb_define_const(mCurl, "CURLAUTH_GSSNEGOTIATE", INT2FIX(CURLAUTH_GSSNEGOTIATE));
 #else
   rb_define_const(mCurl, "CURLAUTH_GSSNEGOTIATE", INT2FIX(0));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use HTTP NTLM authentication. Requires MS Windows or OpenSSL support. */
-#ifdef CURLAUTH_NTLM  
+#ifdef HAVE_CURLAUTH_NTLM
   rb_define_const(mCurl, "CURLAUTH_NTLM", INT2FIX(CURLAUTH_NTLM));
 #else
   rb_define_const(mCurl, "CURLAUTH_NTLM", INT2FIX(0));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, allows libcurl to select any suitable authentication method except basic. */
-#ifdef CURLAUTH_ANYSAFE  
+#ifdef HAVE_CURLAUTH_ANYSAFE
   rb_define_const(mCurl, "CURLAUTH_ANYSAFE", INT2FIX(CURLAUTH_ANYSAFE));
 #else
   rb_define_const(mCurl, "CURLAUTH_ANYSAFE", INT2FIX(0));
 #endif
 
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, allows libcurl to select any suitable authentication method. */
-#ifdef CURLAUTH_ANY
+#ifdef HAVE_CURLAUTH_ANY
   rb_define_const(mCurl, "CURLAUTH_ANY", INT2FIX(CURLAUTH_ANY));
 #else
   rb_define_const(mCurl, "CURLAUTH_ANY", INT2FIX(0));
 #endif
-  
+
   rb_define_singleton_method(mCurl, "ipv6?", ruby_curl_ipv6_q, 0);
   rb_define_singleton_method(mCurl, "kerberos4?", ruby_curl_kerberos4_q, 0);
   rb_define_singleton_method(mCurl, "ssl?", ruby_curl_ssl_q, 0);
@@ -333,4 +369,5 @@ void Init_curb_core() {
   init_curb_errors();
   init_curb_easy();
   init_curb_postfield();
+  init_curb_multi();
 }

data/ext/curb.h

@@ -1,7 +1,7 @@
 /* Curb - Libcurl(3) bindings for Ruby.
- * Copyright (c)2006 Ross Bamford. 
+ * Copyright (c)2006 Ross Bamford.
  * Licensed under the Ruby License. See LICENSE for details.
- * 
+ *
  * $Id: curb.h 39 2006-12-23 15:28:45Z roscopeco $
  */
 
@@ -11,24 +11,38 @@
 #include <ruby.h>
 #include <curl/curl.h>
 
+#include "curb_config.h"
 #include "curb_easy.h"
 #include "curb_errors.h"
 #include "curb_postfield.h"
+#include "curb_multi.h"
 
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.1.4"
-#define CURB_VER_NUM   140
+#define CURB_VERSION   "0.7.15"
+#define CURB_VER_NUM   715
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   1
-#define CURB_VER_MIC   4
-#define CURB_VER_PATCH 0
+#define CURB_VER_MIN   7
+#define CURB_VER_MIC   1
+#define CURB_VER_PATCH 5
 
 
 // Maybe not yet defined in Ruby
-#ifndef RSTRING_LEN 
-#define RSTRING_LEN(x) RSTRING(x)->len 
+#ifndef RSTRING_LEN
+  #define RSTRING_LEN(x) RSTRING(x)->len
+#endif
+
+#ifndef RSTRING_PTR
+  #define RSTRING_PTR(x) RSTRING(x)->ptr
+#endif
+
+#ifndef RHASH_LEN
+#ifdef HAVE_RUBY19_HASH
+  #define RHASH_LEN(hash) RHASH(hash)->ntbl->num_entries
+#else
+  #define RHASH_LEN(hash) RHASH(hash)->tbl->num_entries
+#endif
 #endif
 
 extern VALUE mCurl;
@@ -36,4 +50,3 @@ extern VALUE mCurl;
 extern void Init_curb_core();
 
 #endif
-