[master] 835284ee8 Stop reading ``-r file`` on signals

Poul-Henning Kamp phk at FreeBSD.org
Mon Dec 11 13:35:08 UTC 2023


commit 835284ee871d2076c95addcdd78de19d16e398b0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Dec 11 13:20:20 2023 +0000

    Stop reading ``-r file`` on signals

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index fa26a5ca8..5bdc59956 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -232,6 +232,9 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	(void)priv;
 
 	for (tr = pt[0]; tr != NULL; tr = *++pt) {
+		if (VSIG_int || VSIG_term || VSIG_hup)
+			return (-1);
+
 		if (tr->reason == VSL_r_esi)
 			/* Skip ESI requests */
 			continue;


More information about the varnish-commit mailing list