From 084404b8abccd57f2dff95b1be601f287c1aec57 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 9 Aug 2019 11:17:02 +0200 Subject: CURLOPT_H3: removed There's no use for this anymore and it was never in a release. Closes #4206 --- docs/libcurl/curl_easy_setopt.3 | 2 -- docs/libcurl/opts/CURLOPT_H3.3 | 57 -------------------------------- docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 | 4 +-- docs/libcurl/opts/Makefile.inc | 1 - docs/libcurl/symbols-in-versions | 1 - include/curl/curl.h | 7 +--- lib/setopt.c | 7 ---- packages/OS400/curl.inc.in | 7 +--- 8 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 docs/libcurl/opts/CURLOPT_H3.3 diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 2d052f0a4..486304b62 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -323,8 +323,6 @@ Enable and configure Alt-Svc: treatment. See \fICURLOPT_ALTSVC_CTRL(3)\fP Do an HTTP GET request. See \fICURLOPT_HTTPGET(3)\fP .IP CURLOPT_REQUEST_TARGET Set the request target. \fICURLOPT_REQUEST_TARGET(3)\fP -.IP CURLOPT_H3 -Specify HTTP/3 behavior. \fICURLOPT_H3(3)\fP .IP CURLOPT_HTTP_VERSION HTTP version to use. \fICURLOPT_HTTP_VERSION(3)\fP .IP CURLOPT_HTTP09_ALLOWED diff --git a/docs/libcurl/opts/CURLOPT_H3.3 b/docs/libcurl/opts/CURLOPT_H3.3 deleted file mode 100644 index 3411073fd..000000000 --- a/docs/libcurl/opts/CURLOPT_H3.3 +++ /dev/null @@ -1,57 +0,0 @@ -.\" ************************************************************************** -.\" * _ _ ____ _ -.\" * Project ___| | | | _ \| | -.\" * / __| | | | |_) | | -.\" * | (__| |_| | _ <| |___ -.\" * \___|\___/|_| \_\_____| -.\" * -.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. -.\" * -.\" * This software is licensed as described in the file COPYING, which -.\" * you should have received as part of this distribution. The terms -.\" * are also available at https://curl.haxx.se/docs/copyright.html. -.\" * -.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell -.\" * copies of the Software, and permit persons to whom the Software is -.\" * furnished to do so, under the terms of the COPYING file. -.\" * -.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -.\" * KIND, either express or implied. -.\" * -.\" ************************************************************************** -.\" -.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 - -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. -.SH DEFAULT -0 -.SH PROTOCOLS -HTTPS -.SH EXAMPLE -.nf -CURL *curl = curl_easy_init(); -if(curl) { - CURLcode ret; - curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/"); - curl_easy_setopt(curl, CURLOPT_H3, (long)0); - ret = curl_easy_perform(curl); -} -.fi -.SH AVAILABILITY -Added in 7.66.0 -.SH RETURN VALUE -Returns CURLE_OK if supported, an error otherwise. -.SH "SEE ALSO" -.BR CURLOPT_HTTP_VERSION "(3), " diff --git a/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 b/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 index 564c0dc16..2466d838c 100644 --- a/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 +++ b/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 @@ -62,7 +62,7 @@ TLS handshake. (Added in 7.49.0) directly to server given in the URL. Note that this cannot gracefully downgrade to earlier HTTP version if the server doesn't support HTTP/3. -For more reliably upgrading into HTTP/3, set the prefered version to something +For more reliably upgrading to HTTP/3, set the prefered version to something lower and let the server announce its HTTP/3 support via Alt-Svc:. See \fICURLOPT_ALTSVC(3)\fP. .SH DEFAULT @@ -90,4 +90,4 @@ Along with HTTP Returns CURLE_OK if HTTP is supported, and CURLE_UNKNOWN_OPTION if not. .SH "SEE ALSO" .BR CURLOPT_SSLVERSION "(3), " CURLOPT_HTTP200ALIASES "(3), " -.BR CURLOPT_HTTP09_ALLOWED "(3), " CURLOPT_H3 "(3), " CURLOPT_ALTSVC "(3) " +.BR CURLOPT_HTTP09_ALLOWED "(3), " CURLOPT_ALTSVC "(3) " diff --git a/docs/libcurl/opts/Makefile.inc b/docs/libcurl/opts/Makefile.inc index b7cd7a698..b5f62a159 100644 --- a/docs/libcurl/opts/Makefile.inc +++ b/docs/libcurl/opts/Makefile.inc @@ -151,7 +151,6 @@ man_MANS = \ CURLOPT_FTP_USE_EPSV.3 \ CURLOPT_FTP_USE_PRET.3 \ CURLOPT_GSSAPI_DELEGATION.3 \ - CURLOPT_H3.3 \ CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 \ CURLOPT_HAPROXYPROTOCOL.3 \ CURLOPT_HEADER.3 \ diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 7897d7c2f..cd264b785 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -424,7 +424,6 @@ 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.66.0 CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS 7.59.0 CURLOPT_HAPROXYPROTOCOL 7.60.0 CURLOPT_HEADER 7.1 diff --git a/include/curl/curl.h b/include/curl/curl.h index 7b02846b4..9429355a9 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -920,8 +920,6 @@ typedef enum { #define CURLPROTO_SMBS (1<<27) #define CURLPROTO_ALL (~0) /* enable everything */ -/* bitmask defines for CURLOPT_H3 */ - /* long may be 32 or 64 bits, but we should never depend on anything else but 32 */ #define CURLOPTTYPE_LONG 0 @@ -1924,11 +1922,8 @@ typedef enum { /* maximum age of a connection to consider it for reuse (in seconds) */ CINIT(MAXAGE_CONN, LONG, 288), - /* Bitmask to control HTTP/3 behavior. See CURLH3_* */ - CINIT(H3, LONG, 289), - /* SASL authorisation identity */ - CINIT(SASL_AUTHZID, STRINGPOINT, 290), + CINIT(SASL_AUTHZID, STRINGPOINT, 289), CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/lib/setopt.c b/lib/setopt.c index 1ad721131..48c4f2040 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2755,13 +2755,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) return result; break; #endif - case CURLOPT_H3: -#ifdef ENABLE_QUIC - /* not use anymore */ -#else - return CURLE_NOT_BUILT_IN; -#endif - break; default: /* unknown tag and its companion, just ignore: */ result = CURLE_UNKNOWN_OPTION; diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index c9c046831..5a53b1b21 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -401,9 +401,6 @@ d CURLU_GUESS_SCHEME... d c X'00000200' * - d CURLH3_DIRECT... - d c X'00000001' - * ************************************************************************** * Types ************************************************************************** @@ -1423,10 +1420,8 @@ d c 10287 d CURLOPT_MAXAGE_CONN... d c 00288 - d CURLOPT_H3... - d c 00289 d CURLOPT_SASL_AUTHZID... - d c 10290 + d c 10289 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 -- cgit v1.2.3