From 4b632a08e4b58140b9946b644c7884d3f0294c09 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 11 May 2017 16:29:01 +0000 Subject: Explicitly make s6-tls[cd] die when the app dies I have no explanation for the fact that they sometimes survive their app, and I'm fed up with it, so it's time to use the big hammer. --- src/sbearssl/sbearssl_run.c | 6 +++++- src/stls/stls_run.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sbearssl/sbearssl_run.c b/src/sbearssl/sbearssl_run.c index 26a8bd3..dd2f49b 100644 --- a/src/sbearssl/sbearssl_run.c +++ b/src/sbearssl/sbearssl_run.c @@ -112,7 +112,11 @@ int sbearssl_run (br_ssl_engine_context *ctx, int *fds, pid_t pid, unsigned int /* Signal */ - if (x[0].revents & IOPAUSE_READ) handle_signals(pid, &e) ; + if (x[0].revents & IOPAUSE_READ) + { + handle_signals(pid, &e) ; + if (e >= 0) break ; + } /* Flush to local */ diff --git a/src/stls/stls_run.c b/src/stls/stls_run.c index 3f2742d..b6e1bf3 100644 --- a/src/stls/stls_run.c +++ b/src/stls/stls_run.c @@ -214,7 +214,11 @@ int stls_run (struct tls *ctx, int *fds, pid_t pid, unsigned int verbosity, uint /* Signal */ - if (x[0].revents & IOPAUSE_READ) handle_signals(pid, &e) ; + if (x[0].revents & IOPAUSE_READ) + { + handle_signals(pid, &e) ; + if (e >= 0) break ; + } /* Flush to local */ -- cgit v1.2.3