fixup version numbers, and mark as experimental in docsQUIC

5 files changed, 19 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index f86385615..1ddc3d601 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3409,6 +3409,7 @@ if test X"$want_tcp2" != Xno; then
           CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_TCP2"
           export CURL_LIBRARY_PATH
           AC_MSG_NOTICE([Added $DIR_TCP2 to CURL_LIBRARY_PATH])
+          experimental="$experimental HTTP3"
        )
       ],
         dnl not found, revert back to clean variables
@@ -3475,6 +3476,8 @@ if test X"$want_quiche" != Xno; then
   AC_CHECK_LIB(quiche, quiche_connect,
     [
      AC_CHECK_HEADERS(quiche.h,
+        experimental="$experimental HTTP3"
+        AC_MSG_NOTICE([HTTP3 support is experimental])
         curl_h3_msg="enabled (quiche)"
         QUICHE_ENABLED=1
         AC_DEFINE(USE_QUICHE, 1, [if quiche is in use])
@@ -4316,7 +4319,6 @@ AC_HELP_STRING([--disable-alt-svc],[Disable alt-svc support]),
   *) AC_MSG_RESULT(yes)
        curl_altsvc_msg="enabled";
        enable_altsvc="yes"
-       experimental="alt-svc"
        ;;
   esac ],
        AC_MSG_RESULT(no)
@@ -4324,7 +4326,7 @@ AC_HELP_STRING([--disable-alt-svc],[Disable alt-svc support]),
 
 if test "$enable_altsvc" = "yes"; then
   AC_DEFINE(USE_ALTSVC, 1, [to enable alt-svc])
-  experimental="alt-svc"
+  experimental="$experimental alt-svc"
 fi
 
 dnl ************************************************************
@@ -4636,6 +4638,6 @@ AC_MSG_NOTICE([Configured to build curl/libcurl:
 ])
 if test -n "$experimental"; then
  cat >&2 << _EOF
-  WARNING: $experimental is enabled but marked EXPERIMENTAL. Use with caution!
+  WARNING: $experimental enabled but marked EXPERIMENTAL. Use with caution!
 _EOF
 fi
diff --git a/docs/cmdline-opts/http3-direct.d b/docs/cmdline-opts/http3-direct.d
index bf679a0fc..fb8c8cf28 100644
--- a/docs/cmdline-opts/http3-direct.d
+++ b/docs/cmdline-opts/http3-direct.d
@@ -7,6 +7,8 @@ Requires: HTTP/3
 Help: Use HTTP v3
 ---
 
+WARNING: this option is experiemental. Do not use in production.
+
 Tells curl to use HTTP version 3 directly to the host and port number used in
 the URL. A normal HTTP/3 transaction will be done to a host and then get
 redirected via Alt-SVc, but this option allows a user to circumvent that when
diff --git a/docs/libcurl/opts/CURLOPT_H3.3 b/docs/libcurl/opts/CURLOPT_H3.3
index ddd93d88a..be521b6bf 100644
--- a/docs/libcurl/opts/CURLOPT_H3.3
+++ b/docs/libcurl/opts/CURLOPT_H3.3
@@ -5,7 +5,7 @@
 .\" *                            | (__| |_| |  _ <| |___
 .\" *                             \___|\___/|_| \_\_____|
 .\" *
-.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
 .\" *
 .\" * This software is licensed as described in the file COPYING, which
 .\" * you should have received as part of this distribution. The terms
@@ -20,13 +20,18 @@
 .\" *
 .\" **************************************************************************
 .\"
-.TH CURLOPT_H3 3 "27 Nov 2018" "libcurl 7.64.0" "curl_easy_setopt options"
+.TH CURLOPT_H3 3 "27 Nov 2018" "libcurl 7.66.0" "curl_easy_setopt options"
 .SH NAME
 CURLOPT_H3 \- specify HTTP/3 protocol behavior
 .SH SYNOPSIS
 #include <curl/curl.h>
 
 CURLcode curl_easy_setopt(CURL *handle, CURLOPT_H3, long bitmask);
+.SH EXPERIMENTAL
+Warning: this feature is early code and is marked as experimental. It can only
+be enabled by explicitly invoking configure with \fB--with-quiche\fP or
+\fB--with-ngtcp2\fP. You are advised to not ship this feature used in
+production before the experimental label is removed.
 .SH DESCRIPTION
 This function accepts a long \fIbitmask\fP with a set of flags set that
 controls the HTTP/3 behavior for this transfer.
@@ -49,7 +54,7 @@ if(curl) {
 }
 .fi
 .SH AVAILABILITY
-Added in 7.64.0
+Added in 7.66.0
 .SH RETURN VALUE
 Returns CURLE_OK if supported, an error otherwise.
 .SH "SEE ALSO"
diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions
index ed744af40..1b452d245 100644
--- a/docs/libcurl/symbols-in-versions
+++ b/docs/libcurl/symbols-in-versions
@@ -209,7 +209,7 @@ CURLFTP_CREATE_DIR_RETRY        7.19.4
 CURLGSSAPI_DELEGATION_FLAG      7.22.0
 CURLGSSAPI_DELEGATION_NONE      7.22.0
 CURLGSSAPI_DELEGATION_POLICY_FLAG 7.22.0
-CURLH3_DIRECT                   7.64.0
+CURLH3_DIRECT                   7.66.0
 CURLHEADER_SEPARATE             7.37.0
 CURLHEADER_UNIFIED              7.37.0
 CURLINFO_ACTIVESOCKET           7.45.0
@@ -425,7 +425,7 @@ CURLOPT_FTP_USE_EPRT            7.10.5
 CURLOPT_FTP_USE_EPSV            7.9.2
 CURLOPT_FTP_USE_PRET            7.20.0
 CURLOPT_GSSAPI_DELEGATION       7.22.0
-CURLOPT_H3                      7.64.0
+CURLOPT_H3                      7.66.0
 CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS 7.59.0
 CURLOPT_HAPROXYPROTOCOL         7.60.0
 CURLOPT_HEADER                  7.1
@@ -927,7 +927,7 @@ CURL_VERSION_DEBUG              7.10.6
 CURL_VERSION_GSSAPI             7.38.0
 CURL_VERSION_GSSNEGOTIATE       7.10.6        7.38.0
 CURL_VERSION_HTTP2              7.33.0
-CURL_VERSION_HTTP3              7.64.0
+CURL_VERSION_HTTP3              7.66.0
 CURL_VERSION_HTTPS_PROXY        7.52.0
 CURL_VERSION_IDN                7.12.0
 CURL_VERSION_IPV6               7.10
diff --git a/include/curl/curl.h b/include/curl/curl.h
index a189a00cb..215b3e9e1 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1930,7 +1930,7 @@ typedef enum {
   CINIT(MAXAGE_CONN, LONG, 288),
 
   /* Bitmask to control HTTP/3 behavior. See CURLH3_* */
-  CINIT(H3, LONG, 999),
+  CINIT(H3, LONG, 289),
 
   CURLOPT_LASTENTRY /* the last unused */
 } CURLoption;