aboutsummaryrefslogtreecommitdiff
path: root/src/IO/http.c
diff options
context:
space:
mode:
authorcorvid <devnull@localhost>2016-07-07 14:47:25 +0000
committercorvid <devnull@localhost>2016-07-07 14:47:25 +0000
commitda86576c107e0692fb3f55dc097f5e14cc4527ff (patch)
tree83a1dbdf7ab71301e82a6a02bd8bb87c9e86d410 /src/IO/http.c
parentbd99337e366388866dfae20ecdc2e5ae58011320 (diff)
a little renaming in tls
The handshake stuff should be named handshake. What should you call initialize/setup plus handshake, then? I don't know, but 'connect' for now, anyway.
Diffstat (limited to 'src/IO/http.c')
-rw-r--r--src/IO/http.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/IO/http.c b/src/IO/http.c
index 760497ec..faec1d4a 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -495,8 +495,7 @@ static void Http_send_query(SocketData_t *S)
}
/*
- * Prepare an HTTPS connection. If necessary, tunnel it through a proxy.
- * Then perform the TLS handshake.
+ * Prepare an HTTPS connection. If necessary, tunnel through a proxy first.
*/
static void Http_connect_tls(ChainLink *info)
{
@@ -514,8 +513,8 @@ static void Http_connect_tls(ChainLink *info)
dFree(dbuf);
dFree(connect_str);
} else {
- MSG_BW(S->web, 1, "TLS handshake...");
- a_Tls_handshake(S->SockFD, S->url);
+ MSG_BW(S->web, 1, "Secure connection negotiation...");
+ a_Tls_connect(S->SockFD, S->url);
}
}
@@ -944,7 +943,7 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info,
sd->https_proxy_reply->str);
dStr_free(sd->https_proxy_reply, 1);
sd->https_proxy_reply = NULL;
- a_Tls_handshake(sd->SockFD, sd->url);
+ a_Tls_connect(sd->SockFD, sd->url);
} else {
MSG_BW(sd->web, 1, "Can't connect through proxy to %s",
URL_HOST(sd->url));