From 0f12ee8b390f815db3545aecdad83459f35de34c Mon Sep 17 00:00:00 2001 From: Yedaya Katsman Date: Fri, 5 Jul 2024 18:14:58 +0300 Subject: [PATCH] curl: move more options to deprecated category --no-npn, --sslv2, --sslv3 Closes #14109 --- docs/cmdline-opts/no-npn.md | 2 +- docs/cmdline-opts/sslv2.md | 2 +- docs/cmdline-opts/sslv3.md | 2 +- src/tool_listhelp.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/cmdline-opts/no-npn.md b/docs/cmdline-opts/no-npn.md index d8ad6a251f..dbb69e91bb 100644 --- a/docs/cmdline-opts/no-npn.md +++ b/docs/cmdline-opts/no-npn.md @@ -8,7 +8,7 @@ Added: 7.36.0 Mutexed: Requires: TLS Help: Disable the NPN TLS extension -Category: tls http +Category: deprecated Multi: boolean See-also: - no-alpn diff --git a/docs/cmdline-opts/sslv2.md b/docs/cmdline-opts/sslv2.md index 3bd36f02cd..ea92a2cb46 100644 --- a/docs/cmdline-opts/sslv2.md +++ b/docs/cmdline-opts/sslv2.md @@ -9,7 +9,7 @@ Added: 5.9 Mutexed: sslv3 tlsv1 tlsv1.1 tlsv1.2 Requires: TLS Help: SSLv2 -Category: tls +Category: deprecated Multi: mutex See-also: - http1.1 diff --git a/docs/cmdline-opts/sslv3.md b/docs/cmdline-opts/sslv3.md index 32d4c12066..f022124e10 100644 --- a/docs/cmdline-opts/sslv3.md +++ b/docs/cmdline-opts/sslv3.md @@ -9,7 +9,7 @@ Added: 5.9 Mutexed: sslv2 tlsv1 tlsv1.1 tlsv1.2 Requires: TLS Help: SSLv3 -Category: tls +Category: deprecated Multi: mutex See-also: - http1.1 diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c index 46bbfd1969..a825a03154 100644 --- a/src/tool_listhelp.c +++ b/src/tool_listhelp.c @@ -422,7 +422,7 @@ const struct helptxt helptext[] = { CURLHELP_CONNECTION}, {" --no-npn", "Disable the NPN TLS extension", - CURLHELP_TLS | CURLHELP_HTTP}, + CURLHELP_DEPRECATED}, {" --no-progress-meter", "Do not show the progress meter", CURLHELP_VERBOSE}, @@ -711,10 +711,10 @@ const struct helptxt helptext[] = { CURLHELP_TLS}, {"-2, --sslv2", "SSLv2", - CURLHELP_TLS}, + CURLHELP_DEPRECATED}, {"-3, --sslv3", "SSLv3", - CURLHELP_TLS}, + CURLHELP_DEPRECATED}, {" --stderr ", "Where to redirect stderr", CURLHELP_VERBOSE | CURLHELP_GLOBAL}, -- 2.47.3