summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/help.c1
-rw-r--r--imap/src/c-client/http.c11
-rw-r--r--pith/pine.hlp2
3 files changed, 7 insertions, 7 deletions
diff --git a/alpine/help.c b/alpine/help.c
index 6c5f2e70..83211769 100644
--- a/alpine/help.c
+++ b/alpine/help.c
@@ -140,6 +140,7 @@ helper_internal(HelpType text, char *frag, char *title, int flags)
if(status != HTTP_OK){
shown_text = NO_HELP;
if(help_text) fs_give((void **) &help_text);
+ return MC_FINISH;
}
else{
is_external = 1;
diff --git a/imap/src/c-client/http.c b/imap/src/c-client/http.c
index 23d9f4b0..fef3c7fc 100644
--- a/imap/src/c-client/http.c
+++ b/imap/src/c-client/http.c
@@ -937,7 +937,10 @@ http_open (unsigned char *url)
stream->netstream = net_open (&mb, NIL, mb.port ? mb.port : HTTPTCPPORT,
(NETDRIVER *) mail_parameters (NIL,GET_SSLDRIVER,NIL),
"*https", mb.port ? mb.port : HTTPSSLPORT);
- if(!stream->netstream) http_close(stream);
+ if(!stream->netstream){
+ http_close(stream);
+ stream = NIL;
+ }
return stream;
}
@@ -1048,12 +1051,8 @@ http_get(unsigned char *url, int *code)
HTTPSTREAM *stream;
*code = -1;
- if(!url) return response;
- stream = http_open(url);
- if(!stream){
- fs_give((void **) &url);
+ if(!url || !(stream = http_open(url)))
return response;
- }
http_request = http_request_get();
http_request->request = http_request_line("GET", stream->urltail, HTTP_1_1_VERSION);
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 8673853e..53fbe773 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 452 2020-06-18 12:55:43
+Alpine Commit 453 2020-06-18 15:08:35
============= h_news =================
<HTML>
<HEAD>