]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
curl.h: add CURL_HTTP_VERSION_3 to the version enum
authorDaniel Stenberg <daniel@haxx.se>
Wed, 7 Aug 2019 07:49:18 +0000 (09:49 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Wed, 7 Aug 2019 10:51:52 +0000 (12:51 +0200)
It can't be set for CURLOPT_HTTP_VERSION, but it can be extracted with
CURLINFO_HTTP_VERSION.

docs/libcurl/symbols-in-versions
include/curl/curl.h
lib/getinfo.c
lib/url.c

index 1afe73b533a331abcccad6916cc8b3e37d2616e0..49175e0f5cd4ed2e8a4df701563d47701905f412 100644 (file)
@@ -834,6 +834,7 @@ CURL_HTTP_VERSION_2             7.43.0
 CURL_HTTP_VERSION_2TLS          7.47.0
 CURL_HTTP_VERSION_2_0           7.33.0
 CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE 7.49.0
+CURL_HTTP_VERSION_3             7.66.0
 CURL_HTTP_VERSION_NONE          7.9.1
 CURL_IPRESOLVE_V4               7.10.8
 CURL_IPRESOLVE_V6               7.10.8
index 33aa047a703ca673b892b7fb78dc742eaef97b97..6011e416ff602e08554a7a425c7718cf80ec084b 100644 (file)
@@ -1985,7 +1985,9 @@ enum {
   CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
   CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE,  /* please use HTTP 2 without HTTP/1.1
                                            Upgrade */
-
+  CURL_HTTP_VERSION_3 = 30, /* This cannot be set with CURLOPT_HTTP_VERSION,
+                               use CURLOPT_H3 and/or CURLOPT_ALTSVC to enable
+                               HTTP/3 */
   CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
 };
 
index e118da80d41a9437e40a54fb7eb5ab0435e847a7..5fd8dc018d77d0c784949f5d7419ecb6bdc92f07 100644 (file)
@@ -235,6 +235,9 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
     case 20:
       *param_longp = CURL_HTTP_VERSION_2_0;
       break;
+    case 30:
+      *param_longp = CURL_HTTP_VERSION_3;
+      break;
     default:
       *param_longp = CURL_HTTP_VERSION_NONE;
       break;
index c61319b3bb845d4e463c5b43f0e57e2226c326bf..99bea3f0154d25cc5cba510ea5fc840d5026ddf9 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -3201,7 +3201,7 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
           break;
         case ALPN_h3:
           conn->transport = TRNSPRT_QUIC;
-          conn->httpversion = CURL_HTTP_VERSION_LAST; /* for the moment */
+          conn->httpversion = CURL_HTTP_VERSION_3;
           break;
         default: /* shouldn't be possible */
           break;