[master] 9a7dc49bd Linux documents SO_SNDTIMEO in socket(7)

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Jan 8 17:07:05 UTC 2020


commit 9a7dc49bdf14c05de14ad8502ce38bd1a149d805
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Wed Jan 8 18:06:02 2020 +0100

    Linux documents SO_SNDTIMEO in socket(7)
    
    Closes #3178

diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 0fff1dd39..0731b4a75 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -203,8 +203,8 @@ V1L_Flush(const struct worker *wrk)
 			v1l->cnt += i;
 		while (i != v1l->liov && (i > 0 || errno == EWOULDBLOCK)) {
 			/* Remove sent data from start of I/O vector,
-			 * then retry; we hit a timeout, but some data
-			 * was sent.
+			 * then retry; we hit a timeout, and some data
+			 * may have been sent.
 			 *
 			 * XXX: Add a "minimum sent data per timeout
 			 * counter to prevent slowloris attacks
diff --git a/include/tbl/params.h b/include/tbl/params.h
index c2742057d..dd1e68699 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -772,8 +772,8 @@ PARAM(
 	"Send timeout for individual pieces of data on client connections."
 	" May get extended if 'send_timeout' applies.\n\n"
 	"When this timeout is hit, the session is closed.\n\n"
-	"See the man page for `setsockopt(2)` under ``SO_SNDTIMEO`` for more"
-	" information.",
+	"See the man page for `setsockopt(2)` or `socket(7)` under"
+	" ``SO_SNDTIMEO`` for more information.",
 	/* l-text */	"",
 	/* func */	NULL
 )


More information about the varnish-commit mailing list