git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expansions: Fix ${readsocket } to do nicer TLS close
[exim.git]
/
src
/
src
/
lookups
/
readsock.c
diff --git
a/src/src/lookups/readsock.c
b/src/src/lookups/readsock.c
index a3f87108a1cf31bfcada38b5a04fd31b06ae1b3a..73cc02813f1686b4ab73e47fe3147991e633633a 100644
(file)
--- a/
src/src/lookups/readsock.c
+++ b/
src/src/lookups/readsock.c
@@
-275,6
+275,10
@@
if (!lf.cache) *do_cache = 0;
out:
out:
+#ifndef DISABLE_TLS
+if (cctx->tls_ctx) tls_close(cctx->tls_ctx, TLS_SHUTDOWN_NOWAIT);
+#endif
+
(void) close(cctx->sock);
cctx->sock = -1;
return ret;
(void) close(cctx->sock);
cctx->sock = -1;
return ret;
@@
-294,7
+298,7
@@
readsock_close(void * handle)
client_conn_ctx * cctx = handle;
if (cctx->sock < 0) return;
#ifndef DISABLE_TLS
client_conn_ctx * cctx = handle;
if (cctx->sock < 0) return;
#ifndef DISABLE_TLS
-if (cctx->tls_ctx) tls_close(cctx->tls_ctx, T
RUE
);
+if (cctx->tls_ctx) tls_close(cctx->tls_ctx, T
LS_SHUTDOWN_NOWAIT
);
#endif
close(cctx->sock);
cctx->sock = -1;
#endif
close(cctx->sock);
cctx->sock = -1;