Commit: 26becbaf953eac6691a425521dd41bdc108c363c
Parent: ae768603f30db58e3380f64f351cf96aa9cfbb5d
Author: opask
Date: Thu, 30 Aug 2018 19:15:27 -0600
http{,s}.c: minor cleanup
Diffstat:
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/http.c b/http.c
@@ -193,7 +193,7 @@ void http_func(struct connection *c)
/*set_connection_timeout(c);*/
if (get_keepalive_socket(c, NULL)) {
int p;
- if ((p = get_port(c->url)) == -1) {
+ if ((p = get_port(c->url)) < 0) {
setcstate(c, S_BAD_URL);
abort_connection(c);
return;
@@ -890,7 +890,7 @@ again:
free(head);
free(c->info);
c->info = 0;
- c->ssl = DUMMY;
+ c->ssl = NULL;
continue_connection(c, &c->sock1, http_send_header);
return;
}
diff --git a/https.c b/https.c
@@ -241,16 +241,14 @@ void retrieve_ssl_session(struct connection *c)
char *h;
int p;
- if (c->no_tls /*|| SSL_session_reused(c->ssl->ssl)*/) {
+ if (c->no_tls) {
s = NULL;
c->ssl->session_retrieved = 1;
- } else
- s = SSL_get1_session(c->ssl->ssl);
+ } else if ((s = SSL_get1_session(c->ssl->ssl)))
+ c->ssl->session_retrieved = 1;
orig_url = remove_proxy_prefix(c->url);
h = (char *)get_host_name(orig_url);
p = get_port(orig_url);
- if (s)
- c->ssl->session_retrieved = 1;
set_session_cache_entry(c->ssl->ctx, h, p, s);
free(h);
clear_ssl_errors(__LINE__);