From: Jay Satiro <raysatiro@yahoo.com>
Date: Wed, 4 Dec 2019 06:10:17 +0000 (-0500)
Subject: setopt: Fix ALPN / NPN user option when built without HTTP2
X-Git-Tag: curl-7_68_0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0edf75865a8ab3783cb42acded8288108bbe3b5b;p=thirdparty%2Fcurl.git

setopt: Fix ALPN / NPN user option when built without HTTP2

- Stop treating lack of HTTP2 as an unknown option error result for
  CURLOPT_SSL_ENABLE_ALPN and CURLOPT_SSL_ENABLE_NPN.

Prior to this change it was impossible to disable ALPN / NPN if libcurl
was built without HTTP2. Setting either option would result in
CURLE_UNKNOWN_OPTION and the respective internal option would not be
set. That was incorrect since ALPN and NPN are used independent of
HTTP2.

Reported-by: Shailesh Kapse

Fixes https://github.com/curl/curl/issues/4668
Closes https://github.com/curl/curl/pull/4672
---

diff --git a/lib/setopt.c b/lib/setopt.c
index d7b9ca2850..57e1090ce3 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -2613,14 +2613,12 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
     result = CURLE_NOT_BUILT_IN;
 #endif
     break;
-#ifdef USE_NGHTTP2
   case CURLOPT_SSL_ENABLE_NPN:
     data->set.ssl_enable_npn = (0 != va_arg(param, long)) ? TRUE : FALSE;
     break;
   case CURLOPT_SSL_ENABLE_ALPN:
     data->set.ssl_enable_alpn = (0 != va_arg(param, long)) ? TRUE : FALSE;
     break;
-#endif
 #ifdef USE_UNIX_SOCKETS
   case CURLOPT_UNIX_SOCKET_PATH:
     data->set.abstract_unix_socket = FALSE;