From 93fafb93dbd3a5c27ef9a497256df86f9a6670f8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 28 Mar 2020 00:00:27 +0100 Subject: [PATCH] curl.h: remnove CURL_VERSION_ESNI. Never supported nor documented Considered experimental and therefore we can do this. Closes #5157 --- docs/libcurl/symbols-in-versions | 1 - include/curl/curl.h | 2 -- lib/version.c | 3 --- src/tool_help.c | 1 - 4 files changed, 7 deletions(-) diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index ee8413839..c2ed53880 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -938,7 +938,6 @@ CURL_VERSION_BROTLI 7.57.0 CURL_VERSION_CONV 7.15.4 CURL_VERSION_CURLDEBUG 7.19.6 CURL_VERSION_DEBUG 7.10.6 -CURL_VERSION_ESNI 7.67.0 CURL_VERSION_GSSAPI 7.38.0 CURL_VERSION_GSSNEGOTIATE 7.10.6 7.38.0 CURL_VERSION_HTTP2 7.33.0 diff --git a/include/curl/curl.h b/include/curl/curl.h index 716024753..17f07b09f 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -2818,8 +2818,6 @@ typedef struct { #define CURL_VERSION_ALTSVC (1<<24) /* Alt-Svc handling built-in */ #define CURL_VERSION_HTTP3 (1<<25) /* HTTP3 support built-in */ -#define CURL_VERSION_ESNI (1<<26) /* ESNI support */ - /* * NAME curl_version_info() * diff --git a/lib/version.c b/lib/version.c index ed5592a26..ac7730203 100644 --- a/lib/version.c +++ b/lib/version.c @@ -386,9 +386,6 @@ static curl_version_info_data version_info = { #endif #if defined(USE_ALTSVC) | CURL_VERSION_ALTSVC -#endif -#ifdef USE_ESNI - | CURL_VERSION_ESNI #endif , NULL, /* ssl_version */ diff --git a/src/tool_help.c b/src/tool_help.c index 822f396a3..5afaf822e 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -552,7 +552,6 @@ static const struct feat feats[] = { {"MultiSSL", CURL_VERSION_MULTI_SSL}, {"PSL", CURL_VERSION_PSL}, {"alt-svc", CURL_VERSION_ALTSVC}, - {"ESNI", CURL_VERSION_ESNI}, }; void tool_help(void)