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/sendf.c | |
| parent | cf9342e275b784f5a6006f833b33b40043f228d4 (diff) | |
| download | gnurl-710f14edba4491a4ac9222a7e3103b51fd30dbe0.tar.gz gnurl-710f14edba4491a4ac9222a7e3103b51fd30dbe0.tar.bz2 gnurl-710f14edba4491a4ac9222a7e3103b51fd30dbe0.zip | |
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/sendf.c')
| -rw-r--r-- | lib/sendf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sendf.c b/lib/sendf.c index 1c30c0bc4..4a87c79dd 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -422,7 +422,7 @@ CURLcode Curl_client_write(struct connectdata *conn, } if(type & CLIENTWRITE_BODY) { - if((conn->handler->protocol&CURLPROTO_FTP) && + if((conn->handler->protocol&PROTO_FAMILY_FTP) && conn->proto.ftpc.transfertype == 'A') { /* convert from the network encoding */ CURLcode rc = Curl_convert_from_network(data, ptr, len); |