summaryrefslogtreecommitdiffstats
path: root/lib/pop3.c
diff options
context:
space:
mode:
authorCurl Upstream <curl-library@cool.haxx.se>2017-04-19 05:41:40 (GMT)
committerBrad King <brad.king@kitware.com>2017-05-11 15:26:45 (GMT)
commitfd7d521c9d70655618db8232d45e5aaf81700f91 (patch)
tree3bc749b90e932d6f220d7e1d33d6e0449def135c /lib/pop3.c
parent4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab (diff)
downloadCMake-fd7d521c9d70655618db8232d45e5aaf81700f91.zip
CMake-fd7d521c9d70655618db8232d45e5aaf81700f91.tar.gz
CMake-fd7d521c9d70655618db8232d45e5aaf81700f91.tar.bz2
curl 2017-04-19 (d957e218)
Code extracted from: https://github.com/curl/curl.git at commit d957e2189fdc73cef0ff3d1fb58043d354754449 (curl-7_54_0).
Diffstat (limited to 'lib/pop3.c')
-rw-r--r--lib/pop3.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/pop3.c b/lib/pop3.c
index 9bb691c..3feb3be 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2017, 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
@@ -127,7 +127,8 @@ const struct Curl_handler Curl_handler_pop3 = {
ZERO_NULL, /* readwrite */
PORT_POP3, /* defport */
CURLPROTO_POP3, /* protocol */
- PROTOPT_CLOSEACTION | PROTOPT_NOURLQUERY /* flags */
+ PROTOPT_CLOSEACTION | PROTOPT_NOURLQUERY | /* flags */
+ PROTOPT_URLOPTIONS
};
#ifdef USE_SSL
@@ -153,7 +154,7 @@ const struct Curl_handler Curl_handler_pop3s = {
PORT_POP3S, /* defport */
CURLPROTO_POP3S, /* protocol */
PROTOPT_CLOSEACTION | PROTOPT_SSL
- | PROTOPT_NOURLQUERY /* flags */
+ | PROTOPT_NOURLQUERY | PROTOPT_URLOPTIONS /* flags */
};
#endif
@@ -799,7 +800,7 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
if(pop3code != '+') {
if(data->set.use_ssl != CURLUSESSL_TRY) {
- failf(data, "STARTTLS denied. %c", pop3code);
+ failf(data, "STARTTLS denied");
result = CURLE_USE_SSL_FAILED;
}
else