RubyGems - curb - Versions diffs - 0.8.5 → 1.3.6 - Mend

curb 0.8.5 → 1.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (59) hide show

checksums.yaml +7 -0
data/README.md +579 -0
data/Rakefile +85 -27
data/doc.rb +48 -8
data/ext/banned.h +32 -0
data/ext/curb.c +563 -233
data/ext/curb.h +19 -10
data/ext/curb_easy.c +3229 -368
data/ext/curb_easy.h +42 -0
data/ext/curb_errors.c +117 -18
data/ext/curb_errors.h +9 -5
data/ext/curb_macros.h +33 -21
data/ext/curb_multi.c +1904 -272
data/ext/curb_multi.h +11 -3
data/ext/curb_postfield.c +149 -77
data/ext/curb_postfield.h +1 -0
data/ext/curb_upload.c +38 -11
data/ext/curb_upload.h +2 -0
data/ext/extconf.rb +355 -35
data/lib/curb.rb +1 -0
data/lib/curl/download.rb +160 -0
data/lib/curl/easy.rb +422 -88
data/lib/curl/multi.rb +295 -56
data/lib/curl.rb +676 -11
data/tests/bug_crash_on_debug.rb +14 -28
data/tests/bug_crash_on_progress.rb +32 -16
data/tests/bug_curb_easy_blocks_ruby_threads.rb +10 -15
data/tests/bug_curb_easy_post_with_string_no_content_length_header.rb +6 -30
data/tests/bug_follow_redirect_288.rb +83 -0
data/tests/bug_instance_post_differs_from_class_post.rb +3 -5
data/tests/bug_issue102.rb +17 -0
data/tests/bug_issue_noproxy.rb +56 -0
data/tests/bug_issue_post_redirect.rb +93 -0
data/tests/bug_issue_spnego.rb +41 -0
data/tests/bug_multi_segfault.rb +1 -0
data/tests/bug_poison.rb +29 -0
data/tests/bug_raise_on_callback.rb +30 -0
data/tests/helper.rb +400 -44
data/tests/leak_trace.rb +237 -0
data/tests/mem_check.rb +3 -0
data/tests/tc_curl.rb +31 -1
data/tests/tc_curl_download.rb +98 -7
data/tests/tc_curl_easy.rb +985 -66
data/tests/tc_curl_easy_cookielist.rb +277 -0
data/tests/tc_curl_easy_request_target.rb +41 -0
data/tests/tc_curl_easy_resolve.rb +48 -0
data/tests/tc_curl_maxfilesize.rb +212 -0
data/tests/tc_curl_multi.rb +1111 -51
data/tests/tc_curl_native_coverage.rb +145 -0
data/tests/tc_curl_network_policy.rb +1475 -0
data/tests/tc_curl_postfield.rb +207 -30
data/tests/tc_curl_protocols.rb +388 -0
data/tests/tc_fiber_scheduler.rb +584 -0
data/tests/tc_ftp_options.rb +39 -0
data/tests/tc_gc_compact.rb +223 -0
data/tests/tc_test_server_methods.rb +110 -0
data/tests/timeout.rb +30 -6
metadata +66 -31
data/README +0 -194

data/ext/curb.c CHANGED Viewed

@@ -143,12 +143,14 @@ static VALUE ruby_curl_asyncdns_q(VALUE mod) {
  * in RFC 2478). For libcurl versions < 7.10.8, always returns false.
  */
 static VALUE ruby_curl_spnego_q(VALUE mod) {
-#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;
+#ifdef HAVE_CURL_VERSION_SPNEGO
+  if (ver->features & CURL_VERSION_SPNEGO) return Qtrue;
 #endif
+#ifdef HAVE_CURL_VERSION_GSSNEGOTIATE
+  if (ver->features & CURL_VERSION_GSSNEGOTIATE) return Qtrue;
+#endif
+  return Qfalse;
 }
 /*
@@ -219,12 +221,32 @@ static VALUE ruby_curl_conv_q(VALUE mod) {
 #endif
 }
+/*
+ * call-seq:
+ *   Curl.http2?                                       => true or false
+ *
+ * Returns true if the installed libcurl was built with support for HTTP2.
+ * For libcurl versions < 7.33.0, always returns false.
+ */
+static VALUE ruby_curl_http2_q(VALUE mod) {
+#ifdef HAVE_CURL_VERSION_HTTP2
+  curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
+  return((ver->features & CURL_VERSION_HTTP2) ? Qtrue : Qfalse);
+#else
+  return Qfalse;
+#endif
+}
+static void finalize_curb_core(VALUE data) {
+  curl_global_cleanup();
+}
 void Init_curb_core() {
-  // TODO we need to call curl_global_cleanup at exit!
   curl_version_info_data *ver;
   VALUE curlver, curllongver, curlvernum;
   curl_global_init(CURL_GLOBAL_ALL);
+  rb_set_end_proc(finalize_curb_core, Qnil);
   ver = curl_version_info(CURLVERSION_NOW);
   mCurl = rb_define_module("Curl");
@@ -242,306 +264,416 @@ void Init_curb_core() {
   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));
+  rb_define_const(mCurl, "CURLINFO_TEXT", LONG2NUM(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));
+  rb_define_const(mCurl, "CURLINFO_HEADER_IN", LONG2NUM(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));
+  rb_define_const(mCurl, "CURLINFO_HEADER_OUT", LONG2NUM(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));
+  rb_define_const(mCurl, "CURLINFO_DATA_IN", LONG2NUM(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));
+  rb_define_const(mCurl, "CURLINFO_DATA_OUT", LONG2NUM(CURLINFO_DATA_OUT));
-#ifdef HAVE_CURLFTPMETHOD_MULTICWD
-  rb_define_const(mCurl, "CURL_MULTICWD",  INT2FIX(CURLFTPMETHOD_MULTICWD));
+#ifdef HAVE_CURLFTPMETHOD_MULTICWD
+  rb_define_const(mCurl, "CURL_MULTICWD",  LONG2NUM(CURLFTPMETHOD_MULTICWD));
 #endif
-#ifdef HAVE_CURLFTPMETHOD_NOCWD
-  rb_define_const(mCurl, "CURL_NOCWD",     INT2FIX(CURLFTPMETHOD_NOCWD));
+#ifdef HAVE_CURLFTPMETHOD_NOCWD
+  rb_define_const(mCurl, "CURL_NOCWD",     LONG2NUM(CURLFTPMETHOD_NOCWD));
 #endif
-#ifdef HAVE_CURLFTPMETHOD_SINGLECWD
-  rb_define_const(mCurl, "CURL_SINGLECWD", INT2FIX(CURLFTPMETHOD_SINGLECWD));
+#ifdef HAVE_CURLFTPMETHOD_SINGLECWD
+  rb_define_const(mCurl, "CURL_SINGLECWD", LONG2NUM(CURLFTPMETHOD_SINGLECWD));
 #endif
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is an HTTP proxy. (libcurl >= 7.10) */
 #ifdef HAVE_CURLPROXY_HTTP
-  rb_define_const(mCurl, "CURLPROXY_HTTP", INT2FIX(CURLPROXY_HTTP));
+  rb_define_const(mCurl, "CURLPROXY_HTTP", LONG2NUM(CURLPROXY_HTTP));
 #else
-  rb_define_const(mCurl, "CURLPROXY_HTTP", INT2FIX(-1));
+  rb_define_const(mCurl, "CURLPROXY_HTTP", LONG2NUM(-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));
+  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));
+#ifdef HAVE_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
+#ifdef HAVE_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
+#ifdef HAVE_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
+#ifdef 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));
+  rb_define_const(mCurl, "CURL_USESSL_NONE", LONG2NUM(CURB_FTPSSL_NONE));
+  rb_define_const(mCurl, "CURL_USESSL_TRY", LONG2NUM(CURB_FTPSSL_TRY));
+  rb_define_const(mCurl, "CURL_USESSL_ALL", LONG2NUM(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_SSLVERSION_DEFAULT", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1",   LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   LONG2NUM(-1));
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_0
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_0",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_0", LONG2NUM(-1));
+#endif
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_1
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_1",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_1", LONG2NUM(-1));
+#endif
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_2
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1_2",     LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_MAX_TLSv1_2", LONG2NUM(-1));
+#endif
+#ifdef 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", 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));
+  rb_define_const(mCurl, "CURL_USESSL_CONTROL", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_USESSL_NONE", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_USESSL_TRY", LONG2NUM(-1));
+  rb_define_const(mCurl, "CURL_USESSL_ALL", LONG2NUM(-1));
 #endif
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS4 proxy. (libcurl >= 7.15.2) */
 #ifdef HAVE_CURLPROXY_SOCKS4
-  rb_define_const(mCurl, "CURLPROXY_SOCKS4", INT2FIX(CURLPROXY_SOCKS4));
+  rb_define_const(mCurl, "CURLPROXY_SOCKS4", LONG2NUM(CURLPROXY_SOCKS4));
 #else
-  rb_define_const(mCurl, "CURLPROXY_SOCKS4", INT2FIX(-2));
+  rb_define_const(mCurl, "CURLPROXY_SOCKS4", LONG2NUM(-2));
+#endif
+  /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS4A proxy. (libcurl >= 7.18.0) */
+#ifdef HAVE_CURLPROXY_SOCKS4A
+  rb_define_const(mCurl, "CURLPROXY_SOCKS4A", LONG2NUM(CURLPROXY_SOCKS4A));
+#else
+  rb_define_const(mCurl, "CURLPROXY_SOCKS4A", LONG2NUM(-2));
 #endif
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS5 proxy. (libcurl >= 7.10) */
 #ifdef HAVE_CURLPROXY_SOCKS5
-  rb_define_const(mCurl, "CURLPROXY_SOCKS5", INT2FIX(CURLPROXY_SOCKS5));
+  rb_define_const(mCurl, "CURLPROXY_SOCKS5", LONG2NUM(CURLPROXY_SOCKS5));
 #else
-  rb_define_const(mCurl, "CURLPROXY_SOCKS5", INT2FIX(-2));
+  rb_define_const(mCurl, "CURLPROXY_SOCKS5", LONG2NUM(-2));
+#endif
+  /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS5 proxy (and that the proxy should resolve the hostname). (libcurl >= 7.17.2) */
+#ifdef HAVE_CURLPROXY_SOCKS5_HOSTNAME
+  rb_define_const(mCurl, "CURLPROXY_SOCKS5_HOSTNAME", LONG2NUM(CURLPROXY_SOCKS5_HOSTNAME));
+#else
+  rb_define_const(mCurl, "CURLPROXY_SOCKS5_HOSTNAME", LONG2NUM(-2));
 #endif
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use Basic authentication. */
 #ifdef HAVE_CURLAUTH_BASIC
-  rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(CURLAUTH_BASIC));
+  rb_define_const(mCurl, "CURLAUTH_BASIC", LONG2NUM(CURLAUTH_BASIC));
 #else
-  rb_define_const(mCurl, "CURLAUTH_BASIC", INT2FIX(0));
+  rb_define_const(mCurl, "CURLAUTH_BASIC", LONG2NUM(0));
 #endif
   /* When passed to Curl::Easy#http_auth_types or Curl::Easy#proxy_auth_types, directs libcurl to use Digest authentication. */
 #ifdef HAVE_CURLAUTH_DIGEST
-  rb_define_const(mCurl, "CURLAUTH_DIGEST", INT2FIX(CURLAUTH_DIGEST));
+  rb_define_const(mCurl, "CURLAUTH_DIGEST", LONG2NUM(CURLAUTH_DIGEST));
 #else
-  rb_define_const(mCurl, "CURLAUTH_DIGEST", INT2FIX(0));
+  rb_define_const(mCurl, "CURLAUTH_DIGEST", LONG2NUM(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 HAVE_CURLAUTH_GSSNEGOTIATE
-  rb_define_const(mCurl, "CURLAUTH_GSSNEGOTIATE", INT2FIX(CURLAUTH_GSSNEGOTIATE));
+  rb_define_const(mCurl, "CURLAUTH_GSSNEGOTIATE", LONG2NUM(CURLAUTH_GSSNEGOTIATE));
 #else
-  rb_define_const(mCurl, "CURLAUTH_GSSNEGOTIATE", INT2FIX(0));
+  rb_define_const(mCurl, "CURLAUTH_GSSNEGOTIATE", LONG2NUM(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 HAVE_CURLAUTH_NTLM
-  rb_define_const(mCurl, "CURLAUTH_NTLM", INT2FIX(CURLAUTH_NTLM));
+  rb_define_const(mCurl, "CURLAUTH_NTLM", LONG2NUM(CURLAUTH_NTLM));
 #else
-  rb_define_const(mCurl, "CURLAUTH_NTLM", INT2FIX(0));
+  rb_define_const(mCurl, "CURLAUTH_NTLM", LONG2NUM(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 HAVE_CURLAUTH_ANYSAFE
-  rb_define_const(mCurl, "CURLAUTH_ANYSAFE", INT2FIX(CURLAUTH_ANYSAFE));
+  rb_define_const(mCurl, "CURLAUTH_ANYSAFE", LONG2NUM(CURLAUTH_ANYSAFE));
 #else
-  rb_define_const(mCurl, "CURLAUTH_ANYSAFE", INT2FIX(0));
+  rb_define_const(mCurl, "CURLAUTH_ANYSAFE", LONG2NUM(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 HAVE_CURLAUTH_ANY
-  rb_define_const(mCurl, "CURLAUTH_ANY", INT2FIX(CURLAUTH_ANY));
+  rb_define_const(mCurl, "CURLAUTH_ANY", LONG2NUM(CURLAUTH_ANY));
 #else
-  rb_define_const(mCurl, "CURLAUTH_ANY", INT2FIX(0));
+  rb_define_const(mCurl, "CURLAUTH_ANY", LONG2NUM(0));
 #endif
   CURB_DEFINE(CURLOPT_VERBOSE);
   CURB_DEFINE(CURLOPT_HEADER);
   CURB_DEFINE(CURLOPT_NOPROGRESS);
   CURB_DEFINE(CURLOPT_NOSIGNAL);
+#ifdef HAVE_CURLOPT_PATH_AS_IS
+  CURB_DEFINE(CURLOPT_PATH_AS_IS);
+#endif
   CURB_DEFINE(CURLOPT_WRITEFUNCTION);
   CURB_DEFINE(CURLOPT_WRITEDATA);
   CURB_DEFINE(CURLOPT_READFUNCTION);
   CURB_DEFINE(CURLOPT_READDATA);
+  /* CURLOPT_IOCTLFUNCTION/DATA deprecated since 7.18.0, use SEEKFUNCTION/DATA */
+#ifdef HAVE_CURLOPT_IOCTLFUNCTION
   CURB_DEFINE(CURLOPT_IOCTLFUNCTION);
+#endif
+#ifdef HAVE_CURLOPT_IOCTLDATA
   CURB_DEFINE(CURLOPT_IOCTLDATA);
-#if HAVE_CURLOPT_SEEKFUNCTION
+#endif
+#ifdef HAVE_CURLOPT_SEEKFUNCTION
   CURB_DEFINE(CURLOPT_SEEKFUNCTION);
 #endif
-#if HAVE_CURLOPT_SEEKDATA
+#ifdef HAVE_CURLOPT_SEEKDATA
   CURB_DEFINE(CURLOPT_SEEKDATA);
 #endif
-#if HAVE_CURLOPT_SOCKOPTFUNCTION
+#ifdef HAVE_CURLOPT_SOCKOPTFUNCTION
   CURB_DEFINE(CURLOPT_SOCKOPTFUNCTION);
 #endif
-#if HAVE_CURLOPT_SOCKOPTDATA
+#ifdef HAVE_CURLOPT_SOCKOPTDATA
   CURB_DEFINE(CURLOPT_SOCKOPTDATA);
 #endif
-#if HAVE_CURLOPT_OPENSOCKETFUNCTION
+#ifdef HAVE_CURLOPT_OPENSOCKETFUNCTION
   CURB_DEFINE(CURLOPT_OPENSOCKETFUNCTION);
 #endif
-#if HAVE_CURLOPT_OPENSOCKETDATA
+#ifdef HAVE_CURLOPT_OPENSOCKETDATA
   CURB_DEFINE(CURLOPT_OPENSOCKETDATA);
 #endif
+#ifdef HAVE_CURLOPT_PREREQFUNCTION
+  CURB_DEFINE(CURLOPT_PREREQFUNCTION);
+#endif
+#ifdef HAVE_CURLOPT_PREREQDATA
+  CURB_DEFINE(CURLOPT_PREREQDATA);
+#endif
+  /* CURLOPT_PROGRESSFUNCTION deprecated since 7.32.0, use XFERINFOFUNCTION */
+#ifdef HAVE_CURLOPT_PROGRESSFUNCTION
   CURB_DEFINE(CURLOPT_PROGRESSFUNCTION);
+#endif
+#ifdef HAVE_CURLOPT_PROGRESSDATA
   CURB_DEFINE(CURLOPT_PROGRESSDATA);
+#endif
+#ifdef HAVE_CURLOPT_XFERINFOFUNCTION
+  CURB_DEFINE(CURLOPT_XFERINFOFUNCTION);
+#endif
+#ifdef HAVE_CURLOPT_XFERINFODATA
+  CURB_DEFINE(CURLOPT_XFERINFODATA);
+#endif
   CURB_DEFINE(CURLOPT_HEADERFUNCTION);
   CURB_DEFINE(CURLOPT_WRITEHEADER);
   CURB_DEFINE(CURLOPT_DEBUGFUNCTION);
   CURB_DEFINE(CURLOPT_DEBUGDATA);
   CURB_DEFINE(CURLOPT_SSL_CTX_FUNCTION);
   CURB_DEFINE(CURLOPT_SSL_CTX_DATA);
+  /* CURLOPT_CONV_* deprecated since 7.82.0, serve no purpose anymore */
+#ifdef HAVE_CURLOPT_CONV_TO_NETWORK_FUNCTION
   CURB_DEFINE(CURLOPT_CONV_TO_NETWORK_FUNCTION);
+#endif
+#ifdef HAVE_CURLOPT_CONV_FROM_NETWORK_FUNCTION
   CURB_DEFINE(CURLOPT_CONV_FROM_NETWORK_FUNCTION);
+#endif
+#ifdef HAVE_CURLOPT_CONV_FROM_UTF8_FUNCTION
   CURB_DEFINE(CURLOPT_CONV_FROM_UTF8_FUNCTION);
+#endif
-#if HAVE_CURLOPT_INTERLEAVEFUNCTION
+#ifdef HAVE_CURLOPT_INTERLEAVEFUNCTION
   CURB_DEFINE(CURLOPT_INTERLEAVEFUNCTION);
 #endif
-#if HAVE_CURLOPT_INTERLEAVEDATA
+#ifdef HAVE_CURLOPT_INTERLEAVEDATA
   CURB_DEFINE(CURLOPT_INTERLEAVEDATA);
 #endif
-#if HAVE_CURLOPT_CHUNK_BGN_FUNCTION
+#ifdef HAVE_CURLOPT_CHUNK_BGN_FUNCTION
   CURB_DEFINE(CURLOPT_CHUNK_BGN_FUNCTION);
 #endif
-#if HAVE_CURLOPT_CHUNK_END_FUNCTION
+#ifdef HAVE_CURLOPT_CHUNK_END_FUNCTION
   CURB_DEFINE(CURLOPT_CHUNK_END_FUNCTION);
 #endif
-#if HAVE_CURLOPT_CHUNK_DATA
+#ifdef HAVE_CURLOPT_CHUNK_DATA
   CURB_DEFINE(CURLOPT_CHUNK_DATA);
 #endif
-#if HAVE_CURLOPT_FNMATCH_FUNCTION
+#ifdef HAVE_CURLOPT_FNMATCH_FUNCTION
   CURB_DEFINE(CURLOPT_FNMATCH_FUNCTION);
 #endif
-#if HAVE_CURLOPT_FNMATCH_DATA
+#ifdef HAVE_CURLOPT_FNMATCH_DATA
   CURB_DEFINE(CURLOPT_FNMATCH_DATA);
 #endif
-#if HAVE_CURLOPT_ERRORBUFFER
+#ifdef HAVE_CURLOPT_ERRORBUFFER
   CURB_DEFINE(CURLOPT_ERRORBUFFER);
 #endif
-#if HAVE_CURLOPT_STDERR
+#ifdef HAVE_CURLOPT_STDERR
   CURB_DEFINE(CURLOPT_STDERR);
 #endif
-#if HAVE_CURLOPT_FAILONERROR
+#ifdef HAVE_CURLOPT_FAILONERROR
   CURB_DEFINE(CURLOPT_FAILONERROR);
 #endif
   CURB_DEFINE(CURLOPT_URL);
-#if HAVE_CURLOPT_PROTOCOLS
+  /* CURLOPT_PROTOCOLS deprecated since 7.85.0, use CURLOPT_PROTOCOLS_STR */
+#ifdef HAVE_CURLOPT_PROTOCOLS
   CURB_DEFINE(CURLOPT_PROTOCOLS);
 #endif
-#if HAVE_CURLOPT_REDIR_PROTOCOLS
+#ifdef HAVE_CURLOPT_PROTOCOLS_STR
+  CURB_DEFINE(CURLOPT_PROTOCOLS_STR);
+#endif
+  /* CURLOPT_REDIR_PROTOCOLS deprecated since 7.85.0, use CURLOPT_REDIR_PROTOCOLS_STR */
+#ifdef HAVE_CURLOPT_REDIR_PROTOCOLS
   CURB_DEFINE(CURLOPT_REDIR_PROTOCOLS);
+#endif
+#ifdef HAVE_CURLOPT_REDIR_PROTOCOLS_STR
+  CURB_DEFINE(CURLOPT_REDIR_PROTOCOLS_STR);
 #endif
   CURB_DEFINE(CURLOPT_PROXY);
   CURB_DEFINE(CURLOPT_PROXYPORT);
-#if HAVE_CURLOPT_PROXYTYPE
+#ifdef HAVE_CURLOPT_PROXYTYPE
   CURB_DEFINE(CURLOPT_PROXYTYPE);
 #endif
-#if HAVE_CURLOPT_NOPROXY
+#ifdef HAVE_CURLOPT_NOPROXY
   CURB_DEFINE(CURLOPT_NOPROXY);
 #endif
   CURB_DEFINE(CURLOPT_HTTPPROXYTUNNEL);
-#if HAVE_CURLOPT_SOCKS5_GSSAPI_SERVICE
+  /* CURLOPT_SOCKS5_GSSAPI_SERVICE deprecated since 7.49.0, use CURLOPT_PROXY_SERVICE_NAME */
+#ifdef HAVE_CURLOPT_SOCKS5_GSSAPI_SERVICE
   CURB_DEFINE(CURLOPT_SOCKS5_GSSAPI_SERVICE);
 #endif
-#if HAVE_CURLOPT_SOCKS5_GSSAPI_NEC
+#ifdef HAVE_CURLOPT_PROXY_SERVICE_NAME
+  CURB_DEFINE(CURLOPT_PROXY_SERVICE_NAME);
+#endif
+#ifdef HAVE_CURLOPT_SOCKS5_GSSAPI_NEC
   CURB_DEFINE(CURLOPT_SOCKS5_GSSAPI_NEC);
 #endif
   CURB_DEFINE(CURLOPT_INTERFACE);
-#if HAVE_CURLOPT_LOCALPORT
+#ifdef HAVE_CURLOPT_LOCALPORT
   CURB_DEFINE(CURLOPT_LOCALPORT);
 #endif
   CURB_DEFINE(CURLOPT_DNS_CACHE_TIMEOUT);
+#ifdef HAVE_CURLOPT_DNS_SERVERS
+  CURB_DEFINE(CURLOPT_DNS_SERVERS);
+#endif
+  /* CURLOPT_DNS_USE_GLOBAL_CACHE deprecated since 7.11.1, does nothing since 7.62.0 */
+#ifdef HAVE_CURLOPT_DNS_USE_GLOBAL_CACHE
   CURB_DEFINE(CURLOPT_DNS_USE_GLOBAL_CACHE);
+#endif
   CURB_DEFINE(CURLOPT_BUFFERSIZE);
   CURB_DEFINE(CURLOPT_PORT);
   CURB_DEFINE(CURLOPT_TCP_NODELAY);
-#if HAVE_CURLOPT_ADDRESS_SCOPE
+#ifdef HAVE_CURLOPT_ADDRESS_SCOPE
   CURB_DEFINE(CURLOPT_ADDRESS_SCOPE);
 #endif
   CURB_DEFINE(CURLOPT_NETRC);
     CURB_DEFINE(CURL_NETRC_OPTIONAL);
     CURB_DEFINE(CURL_NETRC_IGNORED);
     CURB_DEFINE(CURL_NETRC_REQUIRED);
-#if HAVE_CURLOPT_NETRC_FILE
+#ifdef HAVE_CURLOPT_NETRC_FILE
   CURB_DEFINE(CURLOPT_NETRC_FILE);
 #endif
   CURB_DEFINE(CURLOPT_USERPWD);
   CURB_DEFINE(CURLOPT_PROXYUSERPWD);
-#if HAVE_CURLOPT_USERNAME
+#ifdef HAVE_CURLOPT_USERNAME
   CURB_DEFINE(CURLOPT_USERNAME);
 #endif
-#if HAVE_CURLOPT_PASSWORD
+#ifdef HAVE_CURLOPT_PASSWORD
   CURB_DEFINE(CURLOPT_PASSWORD);
 #endif
-#if HAVE_CURLOPT_PROXYUSERNAME
+#ifdef HAVE_CURLOPT_PROXYUSERNAME
   CURB_DEFINE(CURLOPT_PASSWORD);
 #endif
-#if HAVE_CURLOPT_PROXYPASSWORD
+#ifdef HAVE_CURLOPT_PROXYPASSWORD
   CURB_DEFINE(CURLOPT_PASSWORD);
 #endif
-#if HAVE_CURLOPT_HTTPAUTH
+#ifdef HAVE_CURLOPT_HTTPAUTH
   CURB_DEFINE(CURLOPT_HTTPAUTH);
 #endif
-#if HAVE_CURLAUTH_DIGEST_IE
+#ifdef HAVE_CURLAUTH_DIGEST_IE
     CURB_DEFINE(CURLAUTH_DIGEST_IE);
 #endif
-#if HAVE_CURLAUTH_ONLY
+#ifdef HAVE_CURLAUTH_ONLY
     CURB_DEFINE(CURLAUTH_ONLY);
 #endif
-#if HAVE_CURLOPT_TLSAUTH_TYPE
+#ifdef HAVE_CURLOPT_TLSAUTH_TYPE
   CURB_DEFINE(CURLOPT_TLSAUTH_TYPE);
 #endif
-#if HAVE_CURLOPT_TLSAUTH_SRP
+#ifdef HAVE_CURLOPT_TLSAUTH_SRP
   CURB_DEFINE(CURLOPT_TLSAUTH_SRP);
 #endif
-#if HAVE_CURLOPT_TLSAUTH_USERNAME
+#ifdef HAVE_CURLOPT_TLSAUTH_USERNAME
   CURB_DEFINE(CURLOPT_TLSAUTH_USERNAME);
 #endif
-#if HAVE_CURLOPT_TLSAUTH_PASSWORD
+#ifdef HAVE_CURLOPT_TLSAUTH_PASSWORD
   CURB_DEFINE(CURLOPT_TLSAUTH_PASSWORD);
 #endif
-#if HAVE_CURLOPT_PROXYAUTH
+#ifdef HAVE_CURLOPT_PROXYAUTH
   CURB_DEFINE(CURLOPT_PROXYAUTH);
 #endif
-#if HAVE_CURLOPT_AUTOREFERER
+#ifdef HAVE_CURLOPT_AUTOREFERER
   CURB_DEFINE(CURLOPT_AUTOREFERER);
 #endif
-#if HAVE_CURLOPT_ENCODING
+#ifdef HAVE_CURLOPT_ENCODING
   CURB_DEFINE(CURLOPT_ENCODING);
 #endif
-#if HAVE_CURLOPT_FOLLOWLOCATION
+#ifdef HAVE_CURLOPT_FOLLOWLOCATION
   CURB_DEFINE(CURLOPT_FOLLOWLOCATION);
 #endif
-#if HAVE_CURLOPT_UNRESTRICTED_AUTH
+#ifdef HAVE_CURLOPT_UNRESTRICTED_AUTH
   CURB_DEFINE(CURLOPT_UNRESTRICTED_AUTH);
 #endif
-#if HAVE_CURLOPT_MAXREDIRS
+#ifdef HAVE_CURLOPT_MAXREDIRS
   CURB_DEFINE(CURLOPT_MAXREDIRS);
 #endif
-#if HAVE_CURLOPT_POSTREDIR
+#ifdef HAVE_CURLOPT_POSTREDIR
   CURB_DEFINE(CURLOPT_POSTREDIR);
 #endif
-#if HAVE_CURLOPT_PUT
+  /* CURLOPT_PUT deprecated since 7.12.1, use CURLOPT_UPLOAD */
+#ifdef HAVE_CURLOPT_PUT
   CURB_DEFINE(CURLOPT_PUT);
 #endif
-#if HAVE_CURLOPT_POST
+#ifdef HAVE_CURLOPT_POST
   CURB_DEFINE(CURLOPT_POST);
 #endif
   CURB_DEFINE(CURLOPT_POSTFIELDS);
   CURB_DEFINE(CURLOPT_POSTFIELDSIZE);
-#if HAVE_CURLOPT_POSTFIELDSIZE_LARGE
+#ifdef HAVE_CURLOPT_POSTFIELDSIZE_LARGE
   CURB_DEFINE(CURLOPT_POSTFIELDSIZE_LARGE);
 #endif
-#if HAVE_CURLOPT_COPYPOSTFIELDS
+#ifdef HAVE_CURLOPT_COPYPOSTFIELDS
   CURB_DEFINE(CURLOPT_COPYPOSTFIELDS);
 #endif
-#if HAVE_CURLOPT_HTTPPOST
+  /* CURLOPT_HTTPPOST deprecated since 7.56.0, use CURLOPT_MIMEPOST */
+#ifdef HAVE_CURLOPT_HTTPPOST
   CURB_DEFINE(CURLOPT_HTTPPOST);
+#endif
+#ifdef HAVE_CURLOPT_MIMEPOST
+  CURB_DEFINE(CURLOPT_MIMEPOST);
 #endif
   CURB_DEFINE(CURLOPT_REFERER);
   CURB_DEFINE(CURLOPT_USERAGENT);
   CURB_DEFINE(CURLOPT_HTTPHEADER);
-#if HAVE_CURLOPT_HTTP200ALIASES
+#ifdef HAVE_CURLOPT_PROXYHEADER
+  CURB_DEFINE(CURLOPT_PROXYHEADER);
+#endif
+#ifdef HAVE_CURLOPT_REQUEST_TARGET
+  /* Allows overriding the Request-URI target used in the request line.
+   * Useful for absolute-form requests or special targets like "*". */
+  CURB_DEFINE(CURLOPT_REQUEST_TARGET);
+#endif
+#ifdef HAVE_CURLOPT_HTTP200ALIASES
   CURB_DEFINE(CURLOPT_HTTP200ALIASES);
 #endif
@@ -549,425 +681,622 @@ void Init_curb_core() {
   CURB_DEFINE(CURLOPT_COOKIEFILE);
   CURB_DEFINE(CURLOPT_COOKIEJAR);
-#if HAVE_CURLOPT_COOKIESESSION
+#ifdef HAVE_CURLOPT_COOKIESESSION
   CURB_DEFINE(CURLOPT_COOKIESESSION);
 #endif
-#if HAVE_CURLOPT_COOKIELIST
+#ifdef HAVE_CURLOPT_COOKIELIST
   CURB_DEFINE(CURLOPT_COOKIELIST);
 #endif
-#if HAVE_CURLOPT_HTTPGET
+#ifdef HAVE_CURLOPT_HTTPGET
   CURB_DEFINE(CURLOPT_HTTPGET);
 #endif
   CURB_DEFINE(CURLOPT_HTTP_VERSION);
     CURB_DEFINE(CURL_HTTP_VERSION_NONE);
     CURB_DEFINE(CURL_HTTP_VERSION_1_0);
     CURB_DEFINE(CURL_HTTP_VERSION_1_1);
-#if HAVE_CURLOPT_IGNORE_CONTENT_LENGTH
+#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
+    CURB_DEFINE(CURL_HTTP_VERSION_2_0);
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072f00 /* 7.47.0 */
+    CURB_DEFINE(CURL_HTTP_VERSION_2TLS);
+#endif
+#ifdef HAVE_CURLOPT_IGNORE_CONTENT_LENGTH
   CURB_DEFINE(CURLOPT_IGNORE_CONTENT_LENGTH);
 #endif
-#if HAVE_CURLOPT_HTTP_CONTENT_DECODING
+#ifdef HAVE_CURLOPT_HTTP_CONTENT_DECODING
   CURB_DEFINE(CURLOPT_HTTP_CONTENT_DECODING);
 #endif
-#if HAVE_CURLOPT_HTTP_TRANSFER_DECODING
+#ifdef HAVE_CURLOPT_HTTP_TRANSFER_DECODING
   CURB_DEFINE(CURLOPT_HTTP_TRANSFER_DECODING);
 #endif
-#if HAVE_CURLOPT_MAIL_FROM
+#ifdef HAVE_CURLOPT_MAIL_FROM
   CURB_DEFINE(CURLOPT_MAIL_FROM);
 #endif
-#if HAVE_CURLOPT_MAIL_RCPT
+#ifdef HAVE_CURLOPT_MAIL_RCPT
   CURB_DEFINE(CURLOPT_MAIL_RCPT);
 #endif
-#if HAVE_CURLOPT_TFTP_BLKSIZE
+#ifdef HAVE_CURLOPT_TFTP_BLKSIZE
   CURB_DEFINE(CURLOPT_TFTP_BLKSIZE);
 #endif
-#if HAVE_CURLOPT_FTPPORT
+#ifdef HAVE_CURLOPT_FTPPORT
   CURB_DEFINE(CURLOPT_FTPPORT);
 #endif
-#if HAVE_CURLOPT_QUOTE
+#ifdef HAVE_CURLOPT_QUOTE
   CURB_DEFINE(CURLOPT_QUOTE);
 #endif
-#if HAVE_CURLOPT_POSTQUOTE
+#ifdef HAVE_CURLOPT_POSTQUOTE
   CURB_DEFINE(CURLOPT_POSTQUOTE);
 #endif
-#if HAVE_CURLOPT_PREQUOTE
+#ifdef HAVE_CURLOPT_PREQUOTE
   CURB_DEFINE(CURLOPT_PREQUOTE);
 #endif
-#if HAVE_CURLOPT_DIRLISTONLY
+#ifdef HAVE_CURLOPT_DIRLISTONLY
   CURB_DEFINE(CURLOPT_DIRLISTONLY);
 #endif
-#if HAVE_CURLOPT_APPEND
+#ifdef HAVE_CURLOPT_APPEND
   CURB_DEFINE(CURLOPT_APPEND);
 #endif
-#if HAVE_CURLOPT_FTP_USE_EPRT
+#ifdef HAVE_CURLOPT_FTP_USE_EPRT
   CURB_DEFINE(CURLOPT_FTP_USE_EPRT);
 #endif
-#if HAVE_CURLOPT_FTP_USE_EPSV
+#ifdef HAVE_CURLOPT_FTP_USE_EPSV
   CURB_DEFINE(CURLOPT_FTP_USE_EPSV);
 #endif
-#if HAVE_CURLOPT_FTP_USE_PRET
+#ifdef HAVE_CURLOPT_FTP_USE_PRET
   CURB_DEFINE(CURLOPT_FTP_USE_PRET);
 #endif
-#if HAVE_CURLOPT_FTP_CREATE_MISSING_DIRS
+#ifdef HAVE_CURLOPT_FTP_CREATE_MISSING_DIRS
   CURB_DEFINE(CURLOPT_FTP_CREATE_MISSING_DIRS);
 #endif
-#if HAVE_CURLOPT_FTP_RESPONSE_TIMEOUT
+#ifdef HAVE_CURLOPT_FTP_RESPONSE_TIMEOUT
   CURB_DEFINE(CURLOPT_FTP_RESPONSE_TIMEOUT);
 #endif
-#if HAVE_CURLOPT_FTP_ALTERNATIVE_TO_USER
+#ifdef HAVE_CURLOPT_FTP_ALTERNATIVE_TO_USER
   CURB_DEFINE(CURLOPT_FTP_ALTERNATIVE_TO_USER);
 #endif
-#if HAVE_CURLOPT_FTP_SKIP_PASV_IP
+#ifdef HAVE_CURLOPT_FTP_SKIP_PASV_IP
   CURB_DEFINE(CURLOPT_FTP_SKIP_PASV_IP);
 #endif
-#if HAVE_CURLOPT_FTPSSLAUTH
+#ifdef HAVE_CURLOPT_FTPSSLAUTH
   CURB_DEFINE(CURLOPT_FTPSSLAUTH);
 #endif
-#if HAVE_CURLFTPAUTH_DEFAULT
+#ifdef HAVE_CURLFTPAUTH_DEFAULT
   CURB_DEFINE(CURLFTPAUTH_DEFAULT);
 #endif
-#if HAVE_CURLFTPAUTH_SSL
+#ifdef HAVE_CURLFTPAUTH_SSL
   CURB_DEFINE(CURLFTPAUTH_SSL);
 #endif
-#if HAVE_CURLFTPAUTH_TLS
+#ifdef HAVE_CURLFTPAUTH_TLS
   CURB_DEFINE(CURLFTPAUTH_TLS);
 #endif
-#if HAVE_CURLOPT_FTP_SSL_CCC
+#ifdef HAVE_CURLOPT_FTP_SSL_CCC
   CURB_DEFINE(CURLOPT_FTP_SSL_CCC);
 #endif
-#if HAVE_CURLFTPSSL_CCC_NONE
+#ifdef HAVE_CURLFTPSSL_CCC_NONE
   CURB_DEFINE(CURLFTPSSL_CCC_NONE);
 #endif
-#if HAVE_CURLFTPSSL_CCC_PASSIVE
+#ifdef HAVE_CURLFTPSSL_CCC_PASSIVE
   CURB_DEFINE(CURLFTPSSL_CCC_PASSIVE);
 #endif
-#if HAVE_CURLFTPSSL_CCC_ACTIVE
+#ifdef HAVE_CURLFTPSSL_CCC_ACTIVE
   CURB_DEFINE(CURLFTPSSL_CCC_ACTIVE);
 #endif
-#if HAVE_CURLOPT_FTP_ACCOUNT
+#ifdef HAVE_CURLOPT_FTP_ACCOUNT
   CURB_DEFINE(CURLOPT_FTP_ACCOUNT);
 #endif
-#if HAVE_CURLOPT_FTP_FILEMETHOD
+#ifdef HAVE_CURLOPT_FTP_FILEMETHOD
   CURB_DEFINE(CURLOPT_FTP_FILEMETHOD);
 #endif
-#if HAVE_CURLFTPMETHOD_MULTICWD
+#ifdef HAVE_CURLFTPMETHOD_MULTICWD
   CURB_DEFINE(CURLFTPMETHOD_MULTICWD);
 #endif
-#if HAVE_CURLFTPMETHOD_NOCWD
+#ifdef HAVE_CURLFTPMETHOD_NOCWD
   CURB_DEFINE(CURLFTPMETHOD_NOCWD);
 #endif
-#if HAVE_CURLFTPMETHOD_SINGLECWD
+#ifdef HAVE_CURLFTPMETHOD_SINGLECWD
   CURB_DEFINE(CURLFTPMETHOD_SINGLECWD);
 #endif
-#if HAVE_CURLOPT_RTSP_REQUEST
+#ifdef HAVE_CURLOPT_RTSP_REQUEST
   CURB_DEFINE(CURLOPT_RTSP_REQUEST);
 #endif
-#if HAVE_CURL_RTSPREQ_OPTIONS
+#ifdef HAVE_CURL_RTSPREQ_OPTIONS
   CURB_DEFINE(CURL_RTSPREQ_OPTIONS);
 #endif
-#if HAVE_CURL_RTSPREQ_DESCRIBE
+#ifdef HAVE_CURL_RTSPREQ_DESCRIBE
   CURB_DEFINE(CURL_RTSPREQ_DESCRIBE);
 #endif
-#if HAVE_CURL_RTSPREQ_ANNOUNCE
+#ifdef HAVE_CURL_RTSPREQ_ANNOUNCE
   CURB_DEFINE(CURL_RTSPREQ_ANNOUNCE);
 #endif
-#if HAVE_CURL_RTSPREQ_SETUP
+#ifdef HAVE_CURL_RTSPREQ_SETUP
   CURB_DEFINE(CURL_RTSPREQ_SETUP);
 #endif
-#if HAVE_CURL_RTSPREQ_PLAY
+#ifdef HAVE_CURL_RTSPREQ_PLAY
   CURB_DEFINE(CURL_RTSPREQ_PLAY);
 #endif
-#if HAVE_CURL_RTSPREQ_PAUSE
+#ifdef HAVE_CURL_RTSPREQ_PAUSE
   CURB_DEFINE(CURL_RTSPREQ_PAUSE);
 #endif
-#if HAVE_CURL_RTSPREQ_TEARDOWN
+#ifdef HAVE_CURL_RTSPREQ_TEARDOWN
   CURB_DEFINE(CURL_RTSPREQ_TEARDOWN);
 #endif
-#if HAVE_CURL_RTSPREQ_GET_PARAMETER
+#ifdef HAVE_CURL_RTSPREQ_GET_PARAMETER
   CURB_DEFINE(CURL_RTSPREQ_GET_PARAMETER);
 #endif
-#if HAVE_CURL_RTSPREQ_SET_PARAMETER
+#ifdef HAVE_CURL_RTSPREQ_SET_PARAMETER
   CURB_DEFINE(CURL_RTSPREQ_SET_PARAMETER);
 #endif
-#if HAVE_CURL_RTSPREQ_RECORD
+#ifdef HAVE_CURL_RTSPREQ_RECORD
   CURB_DEFINE(CURL_RTSPREQ_RECORD);
 #endif
-#if HAVE_CURL_RTSPREQ_RECEIVE
+#ifdef HAVE_CURL_RTSPREQ_RECEIVE
   CURB_DEFINE(CURL_RTSPREQ_RECEIVE);
 #endif
-#if HAVE_CURLOPT_RTSP_SESSION_ID
+#ifdef HAVE_CURLOPT_RTSP_SESSION_ID
   CURB_DEFINE(CURLOPT_RTSP_SESSION_ID);
 #endif
-#if HAVE_CURLOPT_RTSP_STREAM_URI
+#ifdef HAVE_CURLOPT_RTSP_STREAM_URI
   CURB_DEFINE(CURLOPT_RTSP_STREAM_URI);
 #endif
-#if HAVE_CURLOPT_RTSP_TRANSPORT
+#ifdef HAVE_CURLOPT_RTSP_TRANSPORT
   CURB_DEFINE(CURLOPT_RTSP_TRANSPORT);
 #endif
-#if HAVE_CURLOPT_RTSP_HEADER
+#ifdef HAVE_CURLOPT_RTSP_HEADER
   CURB_DEFINE(CURLOPT_RTSP_HEADER);
 #endif
-#if HAVE_CURLOPT_RTSP_CLIENT_CSEQ
+#ifdef HAVE_CURLOPT_RTSP_CLIENT_CSEQ
   CURB_DEFINE(CURLOPT_RTSP_CLIENT_CSEQ);
 #endif
-#if HAVE_CURLOPT_RTSP_SERVER_CSEQ
+#ifdef HAVE_CURLOPT_RTSP_SERVER_CSEQ
   CURB_DEFINE(CURLOPT_RTSP_SERVER_CSEQ);
 #endif
   CURB_DEFINE(CURLOPT_TRANSFERTEXT);
-#if HAVE_CURLOPT_PROXY_TRANSFER_MODE
+#ifdef HAVE_CURLOPT_PROXY_TRANSFER_MODE
   CURB_DEFINE(CURLOPT_PROXY_TRANSFER_MODE);
 #endif
-#if HAVE_CURLOPT_CRLF
+#ifdef HAVE_CURLOPT_CRLF
   CURB_DEFINE(CURLOPT_CRLF);
 #endif
-#if HAVE_CURLOPT_RANGE
+#ifdef HAVE_CURLOPT_RANGE
   CURB_DEFINE(CURLOPT_RANGE);
 #endif
-#if HAVE_CURLOPT_RESUME_FROM
+#ifdef HAVE_CURLOPT_RESUME_FROM
   CURB_DEFINE(CURLOPT_RESUME_FROM);
 #endif
-#if HAVE_CURLOPT_RESUME_FROM_LARGE
+#ifdef HAVE_CURLOPT_RESUME_FROM_LARGE
   CURB_DEFINE(CURLOPT_RESUME_FROM_LARGE);
 #endif
-#if HAVE_CURLOPT_CUSTOMREQUEST
+#ifdef HAVE_CURLOPT_CUSTOMREQUEST
   CURB_DEFINE(CURLOPT_CUSTOMREQUEST);
 #endif
-#if HAVE_CURLOPT_FILETIME
+#ifdef HAVE_CURLOPT_FILETIME
   CURB_DEFINE(CURLOPT_FILETIME);
 #endif
-#if HAVE_CURLOPT_NOBODY
+#ifdef HAVE_CURLOPT_NOBODY
   CURB_DEFINE(CURLOPT_NOBODY);
 #endif
-#if HAVE_CURLOPT_INFILESIZE
+#ifdef HAVE_CURLOPT_INFILESIZE
   CURB_DEFINE(CURLOPT_INFILESIZE);
 #endif
-#if HAVE_CURLOPT_INFILESIZE_LARGE
+#ifdef HAVE_CURLOPT_INFILESIZE_LARGE
   CURB_DEFINE(CURLOPT_INFILESIZE_LARGE);
 #endif
-#if HAVE_CURLOPT_UPLOAD
+#ifdef HAVE_CURLOPT_UPLOAD
   CURB_DEFINE(CURLOPT_UPLOAD);
 #endif
-#if HAVE_CURLOPT_MAXFILESIZE
+#ifdef HAVE_CURLOPT_MAXFILESIZE
   CURB_DEFINE(CURLOPT_MAXFILESIZE);
 #endif
-#if HAVE_CURLOPT_MAXFILESIZE_LARGE
+#ifdef HAVE_CURLOPT_MAXFILESIZE_LARGE
   CURB_DEFINE(CURLOPT_MAXFILESIZE_LARGE);
 #endif
-#if HAVE_CURLOPT_TIMECONDITION
+#ifdef HAVE_CURLOPT_TIMECONDITION
   CURB_DEFINE(CURLOPT_TIMECONDITION);
 #endif
-#if HAVE_CURLOPT_TIMEVALUE
+#ifdef HAVE_CURLOPT_TIMEVALUE
   CURB_DEFINE(CURLOPT_TIMEVALUE);
 #endif
-#if HAVE_CURLOPT_TIMEOUT
+#ifdef HAVE_CURLOPT_TIMEOUT
   CURB_DEFINE(CURLOPT_TIMEOUT);
 #endif
-#if HAVE_CURLOPT_TIMEOUT_MS
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
   CURB_DEFINE(CURLOPT_TIMEOUT_MS);
 #endif
-#if HAVE_CURLOPT_LOW_SPEED_LIMIT
+#ifdef HAVE_CURLOPT_LOW_SPEED_LIMIT
   CURB_DEFINE(CURLOPT_LOW_SPEED_LIMIT);
 #endif
-#if HAVE_CURLOPT_LOW_SPEED_TIME
+#ifdef HAVE_CURLOPT_LOW_SPEED_TIME
   CURB_DEFINE(CURLOPT_LOW_SPEED_TIME);
 #endif
-#if HAVE_CURLOPT_MAX_SEND_SPEED_LARGE
+#ifdef HAVE_CURLOPT_MAX_SEND_SPEED_LARGE
   CURB_DEFINE(CURLOPT_MAX_SEND_SPEED_LARGE);
 #endif
-#if HAVE_CURLOPT_MAX_RECV_SPEED_LARGE
+#ifdef HAVE_CURLOPT_MAX_RECV_SPEED_LARGE
   CURB_DEFINE(CURLOPT_MAX_RECV_SPEED_LARGE);
 #endif
-#if HAVE_CURLOPT_MAXCONNECTS
+#ifdef HAVE_CURLOPT_MAXCONNECTS
   CURB_DEFINE(CURLOPT_MAXCONNECTS);
 #endif
-#if HAVE_CURLOPT_CLOSEPOLICY
+#ifdef HAVE_CURLOPT_CLOSEPOLICY
   CURB_DEFINE(CURLOPT_CLOSEPOLICY);
 #endif
-#if HAVE_CURLOPT_FRESH_CONNECT
+#ifdef HAVE_CURLOPT_FRESH_CONNECT
   CURB_DEFINE(CURLOPT_FRESH_CONNECT);
 #endif
-#if HAVE_CURLOPT_FORBID_REUSE
+#ifdef HAVE_CURLOPT_FORBID_REUSE
   CURB_DEFINE(CURLOPT_FORBID_REUSE);
 #endif
-#if HAVE_CURLOPT_CONNECTTIMEOUT
+#ifdef HAVE_CURLOPT_CONNECTTIMEOUT
   CURB_DEFINE(CURLOPT_CONNECTTIMEOUT);
 #endif
-#if HAVE_CURLOPT_CONNECTTIMEOUT_MS
+#ifdef HAVE_CURLOPT_CONNECTTIMEOUT_MS
   CURB_DEFINE(CURLOPT_CONNECTTIMEOUT_MS);
 #endif
-#if HAVE_CURLOPT_IPRESOLVE
+#ifdef HAVE_CURLOPT_IPRESOLVE
   CURB_DEFINE(CURLOPT_IPRESOLVE);
 #endif
-#if HAVE_CURL_IPRESOLVE_WHATEVER
+#ifdef HAVE_CURL_IPRESOLVE_WHATEVER
   CURB_DEFINE(CURL_IPRESOLVE_WHATEVER);
 #endif
-#if HAVE_CURL_IPRESOLVE_V4
+#ifdef HAVE_CURL_IPRESOLVE_V4
   CURB_DEFINE(CURL_IPRESOLVE_V4);
 #endif
-#if HAVE_CURL_IPRESOLVE_V6
+#ifdef HAVE_CURL_IPRESOLVE_V6
   CURB_DEFINE(CURL_IPRESOLVE_V6);
 #endif
-#if HAVE_CURLOPT_CONNECT_ONLY
+#ifdef HAVE_CURLOPT_CONNECT_ONLY
   CURB_DEFINE(CURLOPT_CONNECT_ONLY);
 #endif
-#if HAVE_CURLOPT_USE_SSL
+#ifdef HAVE_CURLOPT_USE_SSL
   CURB_DEFINE(CURLOPT_USE_SSL);
 #endif
-#if HAVE_CURLUSESSL_NONE
+#ifdef HAVE_CURLUSESSL_NONE
   CURB_DEFINE(CURLUSESSL_NONE);
 #endif
-#if HAVE_CURLUSESSL_TRY
+#ifdef HAVE_CURLUSESSL_TRY
   CURB_DEFINE(CURLUSESSL_TRY);
 #endif
-#if HAVE_CURLUSESSL_CONTROL
+#ifdef HAVE_CURLUSESSL_CONTROL
   CURB_DEFINE(CURLUSESSL_CONTROL);
 #endif
-#if HAVE_CURLUSESSL_ALL
+#ifdef HAVE_CURLUSESSL_ALL
   CURB_DEFINE(CURLUSESSL_ALL);
 #endif
-#if HAVE_CURLOPT_RESOLVE
+#ifdef HAVE_CURLOPT_CONNECT_TO
+  CURB_DEFINE(CURLOPT_CONNECT_TO);
+#endif
+#ifdef HAVE_CURLOPT_RESOLVE
   CURB_DEFINE(CURLOPT_RESOLVE);
 #endif
-#if HAVE_CURLOPT_SSLCERT
+#ifdef HAVE_CURLOPT_SSLCERT
   CURB_DEFINE(CURLOPT_SSLCERT);
 #endif
-#if HAVE_CURLOPT_SSLCERTTYPE
+#ifdef HAVE_CURLOPT_SSLCERTTYPE
   CURB_DEFINE(CURLOPT_SSLCERTTYPE);
 #endif
-#if HAVE_CURLOPT_SSLKEY
+#ifdef HAVE_CURLOPT_SSLKEY
   CURB_DEFINE(CURLOPT_SSLKEY);
 #endif
-#if HAVE_CURLOPT_SSLKEYTYPE
+#ifdef HAVE_CURLOPT_SSLKEYTYPE
   CURB_DEFINE(CURLOPT_SSLKEYTYPE);
 #endif
-#if HAVE_CURLOPT_KEYPASSWD
+#ifdef HAVE_CURLOPT_KEYPASSWD
   CURB_DEFINE(CURLOPT_KEYPASSWD);
 #endif
-#if HAVE_CURLOPT_SSLENGINE
+#ifdef HAVE_CURLOPT_SSLENGINE
   CURB_DEFINE(CURLOPT_SSLENGINE);
 #endif
-#if HAVE_CURLOPT_SSLENGINE_DEFAULT
+#ifdef HAVE_CURLOPT_SSLENGINE_DEFAULT
   CURB_DEFINE(CURLOPT_SSLENGINE_DEFAULT);
 #endif
-#if HAVE_CURLOPT_SSLVERSION
+#ifdef HAVE_CURLOPT_SSLVERSION
   CURB_DEFINE(CURLOPT_SSLVERSION);
 #endif
-#if HAVE_CURL_SSLVERSION_TLSv1
+#ifdef HAVE_CURL_SSLVERSION_TLSv1
   CURB_DEFINE(CURL_SSLVERSION_TLSv1);
 #endif
-#if HAVE_CURL_SSLVERSION_SSLv2
+#ifdef HAVE_CURL_SSLVERSION_SSLv2
   CURB_DEFINE(CURL_SSLVERSION_SSLv2);
 #endif
-#if HAVE_CURL_SSLVERSION_SSLv3
+#ifdef HAVE_CURL_SSLVERSION_SSLv3
   CURB_DEFINE(CURL_SSLVERSION_SSLv3);
 #endif
-#if HAVE_CURLOPT_SSL_VERIFYPEER
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_0
+  CURB_DEFINE(CURL_SSLVERSION_TLSv1_0);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_0);
+#endif
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_1
+  CURB_DEFINE(CURL_SSLVERSION_TLSv1_1);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_1);
+#endif
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_2
+  CURB_DEFINE(CURL_SSLVERSION_TLSv1_2);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_2);
+#endif
+#ifdef HAVE_CURL_SSLVERSION_TLSv1_3
+  CURB_DEFINE(CURL_SSLVERSION_TLSv1_3);
+  CURB_DEFINE(CURL_SSLVERSION_MAX_TLSv1_3);
+#endif
+#ifdef HAVE_CURLOPT_SSL_VERIFYPEER
   CURB_DEFINE(CURLOPT_SSL_VERIFYPEER);
 #endif
-#if HAVE_CURLOPT_CAINFO
+#ifdef HAVE_CURLOPT_DOH_URL
+  CURB_DEFINE(CURLOPT_DOH_URL);
+#endif
+#ifdef HAVE_CURLOPT_DOH_SSL_VERIFYPEER
+  CURB_DEFINE(CURLOPT_DOH_SSL_VERIFYPEER);
+#endif
+#ifdef HAVE_CURLOPT_DOH_SSL_VERIFYHOST
+  CURB_DEFINE(CURLOPT_DOH_SSL_VERIFYHOST);
+#endif
+#ifdef HAVE_CURLOPT_DOH_SSL_VERIFYSTATUS
+  CURB_DEFINE(CURLOPT_DOH_SSL_VERIFYSTATUS);
+#endif
+#ifdef HAVE_CURLOPT_CAINFO
   CURB_DEFINE(CURLOPT_CAINFO);
 #endif
-#if HAVE_CURLOPT_ISSUERCERT
+#ifdef HAVE_CURLOPT_ISSUERCERT
   CURB_DEFINE(CURLOPT_ISSUERCERT);
 #endif
-#if HAVE_CURLOPT_CAPATH
+#ifdef HAVE_CURLOPT_CAPATH
   CURB_DEFINE(CURLOPT_CAPATH);
 #endif
-#if HAVE_CURLOPT_CRLFILE
+#ifdef HAVE_CURLOPT_CRLFILE
   CURB_DEFINE(CURLOPT_CRLFILE);
 #endif
-#if HAVE_CURLOPT_SSL_VERIFYHOST
+#ifdef HAVE_CURLOPT_SSL_VERIFYHOST
   CURB_DEFINE(CURLOPT_SSL_VERIFYHOST);
 #endif
-#if HAVE_CURLOPT_CERTINFO
+#ifdef HAVE_CURLOPT_CERTINFO
   CURB_DEFINE(CURLOPT_CERTINFO);
 #endif
-#if HAVE_CURLOPT_RANDOM_FILE
+  /* CURLOPT_RANDOM_FILE deprecated since 7.84.0, serves no purpose */
+#ifdef HAVE_CURLOPT_RANDOM_FILE
   CURB_DEFINE(CURLOPT_RANDOM_FILE);
 #endif
-#if HAVE_CURLOPT_EGDSOCKET
+  /* CURLOPT_EGDSOCKET deprecated since 7.84.0, serves no purpose */
+#ifdef HAVE_CURLOPT_EGDSOCKET
   CURB_DEFINE(CURLOPT_EGDSOCKET);
 #endif
-#if HAVE_CURLOPT_SSL_CIPHER_LIST
+#ifdef HAVE_CURLOPT_SSL_CIPHER_LIST
   CURB_DEFINE(CURLOPT_SSL_CIPHER_LIST);
 #endif
-#if HAVE_CURLOPT_SSL_SESSIONID_CACHE
+#ifdef HAVE_CURLOPT_SSL_SESSIONID_CACHE
   CURB_DEFINE(CURLOPT_SSL_SESSIONID_CACHE);
 #endif
-#if HAVE_CURLOPT_KRBLEVEL
+#ifdef HAVE_CURLOPT_KRBLEVEL
   CURB_DEFINE(CURLOPT_KRBLEVEL);
 #endif
-#if HAVE_CURLOPT_SSH_AUTH_TYPES
+#ifdef HAVE_CURLOPT_SSH_AUTH_TYPES
   CURB_DEFINE(CURLOPT_SSH_AUTH_TYPES);
 #endif
-#if HAVE_CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
+#ifdef HAVE_CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
   CURB_DEFINE(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
 #endif
-#if HAVE_CURLOPT_SSH_PUBLIC_KEYFILE
+#ifdef HAVE_CURLOPT_SSH_PUBLIC_KEYFILE
   CURB_DEFINE(CURLOPT_SSH_PUBLIC_KEYFILE);
 #endif
-#if HAVE_CURLOPT_SSH_PRIVATE_KEYFILE
+#ifdef HAVE_CURLOPT_SSH_PRIVATE_KEYFILE
   CURB_DEFINE(CURLOPT_SSH_PRIVATE_KEYFILE);
 #endif
-#if HAVE_CURLOPT_SSH_KNOWNHOSTS
+#ifdef HAVE_CURLOPT_SSH_KNOWNHOSTS
   CURB_DEFINE(CURLOPT_SSH_KNOWNHOSTS);
 #endif
-#if HAVE_CURLOPT_SSH_KEYFUNCTION
+#ifdef HAVE_CURLOPT_SSH_KEYFUNCTION
   CURB_DEFINE(CURLOPT_SSH_KEYFUNCTION);
 #endif
-#if HAVE_CURLKHSTAT_FINE_ADD_TO_FILE
+#ifdef HAVE_CURLKHSTAT_FINE_ADD_TO_FILE
   CURB_DEFINE(CURLKHSTAT_FINE_ADD_TO_FILE);
 #endif
-#if HAVE_CURLKHSTAT_FINE
+#ifdef HAVE_CURLKHSTAT_FINE
   CURB_DEFINE(CURLKHSTAT_FINE);
 #endif
-#if HAVE_CURLKHSTAT_REJECT
+#ifdef HAVE_CURLKHSTAT_REJECT
   CURB_DEFINE(CURLKHSTAT_REJECT);
 #endif
-#if HAVE_CURLKHSTAT_DEFER
+#ifdef HAVE_CURLKHSTAT_DEFER
   CURB_DEFINE(CURLKHSTAT_DEFER);
 #endif
-#if HAVE_CURLOPT_SSH_KEYDATA
+#ifdef HAVE_CURLOPT_SSH_KEYDATA
   CURB_DEFINE(CURLOPT_SSH_KEYDATA);
 #endif
-#if HAVE_CURLOPT_PRIVATE
+#ifdef HAVE_CURLOPT_PRIVATE
   CURB_DEFINE(CURLOPT_PRIVATE);
 #endif
-#if HAVE_CURLOPT_SHARE
+#ifdef HAVE_CURLOPT_SHARE
   CURB_DEFINE(CURLOPT_SHARE);
 #endif
-#if HAVE_CURLOPT_NEW_FILE_PERMS
+#ifdef HAVE_CURLOPT_NEW_FILE_PERMS
   CURB_DEFINE(CURLOPT_NEW_FILE_PERMS);
 #endif
-#if HAVE_CURLOPT_NEW_DIRECTORY_PERMS
+#ifdef HAVE_CURLOPT_NEW_DIRECTORY_PERMS
   CURB_DEFINE(CURLOPT_NEW_DIRECTORY_PERMS);
 #endif
-#if HAVE_CURLOPT_TELNETOPTIONS
+#ifdef HAVE_CURLOPT_TELNETOPTIONS
   CURB_DEFINE(CURLOPT_TELNETOPTIONS);
 #endif
-#if HAVE_CURLOPT_GSSAPI_DELEGATION
+#ifdef HAVE_CURLOPT_GSSAPI_DELEGATION
   CURB_DEFINE(CURLOPT_GSSAPI_DELEGATION);
 #endif
-#if HAVE_CURLGSSAPI_DELEGATION_FLAG
+#ifdef HAVE_CURLGSSAPI_DELEGATION_FLAG
   CURB_DEFINE(CURLGSSAPI_DELEGATION_FLAG);
 #endif
-#if HAVE_CURLGSSAPI_DELEGATION_POLICY_FLAG
+#ifdef HAVE_CURLGSSAPI_DELEGATION_POLICY_FLAG
   CURB_DEFINE(CURLGSSAPI_DELEGATION_POLICY_FLAG);
 #endif
+#ifdef HAVE_CURLOPT_UNIX_SOCKET_PATH
+  CURB_DEFINE(CURLOPT_UNIX_SOCKET_PATH);
+#endif
+#ifdef HAVE_CURLOPT_PIPEWAIT
+  CURB_DEFINE(CURLOPT_PIPEWAIT);
+#endif
+#ifdef HAVE_CURLOPT_TCP_KEEPALIVE
+  CURB_DEFINE(CURLOPT_TCP_KEEPALIVE);
+  CURB_DEFINE(CURLOPT_TCP_KEEPIDLE);
+  CURB_DEFINE(CURLOPT_TCP_KEEPINTVL);
+#endif
+#ifdef HAVE_CURLOPT_HAPROXYPROTOCOL
+  CURB_DEFINE(CURLOPT_HAPROXYPROTOCOL);
+#endif
+#ifdef HAVE_CURLOPT_PROXY_SSL_VERIFYHOST
+  CURB_DEFINE(CURLOPT_PROXY_SSL_VERIFYHOST);
+#endif
+#ifdef HAVE_CURLPROTO_RTMPTE
+  CURB_DEFINE(CURLPROTO_RTMPTE);
+#endif
+#ifdef HAVE_CURLPROTO_RTMPTS
+  CURB_DEFINE(CURLPROTO_RTMPTS);
+#endif
+#ifdef HAVE_CURLPROTO_SMBS
+  CURB_DEFINE(CURLPROTO_SMBS);
+#endif
+#ifdef HAVE_CURLPROTO_LDAP
+  CURB_DEFINE(CURLPROTO_LDAP);
+#endif
+#ifdef HAVE_CURLPROTO_FTP
+  CURB_DEFINE(CURLPROTO_FTP);
+#endif
+#ifdef HAVE_CURLPROTO_SMTPS
+  CURB_DEFINE(CURLPROTO_SMTPS);
+#endif
+#ifdef HAVE_CURLPROTO_HTTP
+  CURB_DEFINE(CURLPROTO_HTTP);
+#endif
+#ifdef HAVE_CURLPROTO_SMTP
+  CURB_DEFINE(CURLPROTO_SMTP);
+#endif
+#ifdef HAVE_CURLPROTO_TFTP
+  CURB_DEFINE(CURLPROTO_TFTP);
+#endif
+#ifdef HAVE_CURLPROTO_LDAPS
+  CURB_DEFINE(CURLPROTO_LDAPS);
+#endif
+#ifdef HAVE_CURLPROTO_IMAPS
+  CURB_DEFINE(CURLPROTO_IMAPS);
+#endif
+#ifdef HAVE_CURLPROTO_SCP
+  CURB_DEFINE(CURLPROTO_SCP);
+#endif
+#ifdef HAVE_CURLPROTO_SFTP
+  CURB_DEFINE(CURLPROTO_SFTP);
+#endif
+#ifdef HAVE_CURLPROTO_TELNET
+  CURB_DEFINE(CURLPROTO_TELNET);
+#endif
+#ifdef HAVE_CURLPROTO_FILE
+  CURB_DEFINE(CURLPROTO_FILE);
+#endif
+#ifdef HAVE_CURLPROTO_FTPS
+  CURB_DEFINE(CURLPROTO_FTPS);
+#endif
+#ifdef HAVE_CURLPROTO_HTTPS
+  CURB_DEFINE(CURLPROTO_HTTPS);
+#endif
+#ifdef HAVE_CURLPROTO_IMAP
+  CURB_DEFINE(CURLPROTO_IMAP);
+#endif
+#ifdef HAVE_CURLPROTO_POP3
+  CURB_DEFINE(CURLPROTO_POP3);
+#endif
+#ifdef HAVE_CURLPROTO_GOPHER
+  CURB_DEFINE(CURLPROTO_GOPHER);
+#endif
+#ifdef HAVE_CURLPROTO_DICT
+  CURB_DEFINE(CURLPROTO_DICT);
+#endif
+#ifdef HAVE_CURLPROTO_SMB
+  CURB_DEFINE(CURLPROTO_SMB);
+#endif
+#ifdef HAVE_CURLPROTO_RTMP
+  CURB_DEFINE(CURLPROTO_RTMP);
+#endif
+#ifdef HAVE_CURLPROTO_ALL
+  CURB_DEFINE(CURLPROTO_ALL);
+#endif
+#ifdef HAVE_CURLPROTO_RTMPE
+  CURB_DEFINE(CURLPROTO_RTMPE);
+#endif
+#ifdef HAVE_CURLPROTO_RTMPS
+  CURB_DEFINE(CURLPROTO_RTMPS);
+#endif
+#ifdef HAVE_CURLPROTO_RTMPT
+  CURB_DEFINE(CURLPROTO_RTMPT);
+#endif
+#ifdef HAVE_CURLPROTO_POP3S
+  CURB_DEFINE(CURLPROTO_POP3S);
+#endif
+#ifdef HAVE_CURLPROTO_RTSP
+  CURB_DEFINE(CURLPROTO_RTSP);
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072B00 /* 7.43.0 */
+  CURB_DEFINE(CURLPIPE_NOTHING);
+  CURB_DEFINE(CURLPIPE_HTTP1);
+  CURB_DEFINE(CURLPIPE_MULTIPLEX);
+  rb_define_const(mCurl, "PIPE_NOTHING", LONG2NUM(CURLPIPE_NOTHING));
+  rb_define_const(mCurl, "PIPE_HTTP1", LONG2NUM(CURLPIPE_HTTP1));
+  rb_define_const(mCurl, "PIPE_MULTIPLEX", LONG2NUM(CURLPIPE_MULTIPLEX));
+#endif
+#if LIBCURL_VERSION_NUM >= 0x072100 /* 7.33.0 */
+  rb_define_const(mCurl, "HTTP_2_0", LONG2NUM(CURL_HTTP_VERSION_2_0));
+#endif
+#ifdef CURL_HTTP_VERSION_2TLS
+  rb_define_const(mCurl, "HTTP_2TLS", LONG2NUM(CURL_HTTP_VERSION_2TLS));
+#endif
+#ifdef CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE
+  rb_define_const(mCurl, "HTTP_2_PRIOR_KNOWLEDGE", LONG2NUM(CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE));
+#endif
   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_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);
@@ -981,6 +1310,7 @@ void Init_curb_core() {
   rb_define_singleton_method(mCurl, "idn?", ruby_curl_idn_q, 0);
   rb_define_singleton_method(mCurl, "sspi?", ruby_curl_sspi_q, 0);
   rb_define_singleton_method(mCurl, "conv?", ruby_curl_conv_q, 0);
+  rb_define_singleton_method(mCurl, "http2?", ruby_curl_http2_q, 0);
   init_curb_errors();
   init_curb_easy();