diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-04-20 19:37:54 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-04-23 22:36:01 +0200 |
| commit | 710f14edba4491a4ac9222a7e3103b51fd30dbe0 (patch) | |
| tree | 18b564248ec40eb30d030a8e246b3ecda3715ce6 /lib/http2.c | |
| parent | cf9342e275b784f5a6006f833b33b40043f228d4 (diff) | |
handler: make 'protocol' always specified as a single bit
This makes the findprotocol() function work as intended so that libcurl
can properly be restricted to not support HTTP while still supporting
HTTPS - since the HTTPS handler previously set both the HTTP and HTTPS
bits in the protocol field.
This fixes --proto and --proto-redir for most SSL protocols.
This is done by adding a few new convenience defines that groups HTTP
and HTTPS, FTP and FTPS etc that should then be used when the code wants
to check for both protocols at once. PROTO_FAMILY_[protocol] style.
Bug: https://github.com/bagder/curl/pull/97
Reported-by: drizzt
Diffstat (limited to 'lib/http2.c')
| -rw-r--r-- | lib/http2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http2.c b/lib/http2.c index aa2db4399..75956a021 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -136,7 +136,7 @@ const struct Curl_handler Curl_handler_http2_ssl = { http2_disconnect, /* disconnect */ ZERO_NULL, /* readwrite */ PORT_HTTP, /* defport */ - CURLPROTO_HTTP | CURLPROTO_HTTPS, /* protocol */ + CURLPROTO_HTTPS, /* protocol */ PROTOPT_SSL /* flags */ }; |