[PATCH] upload-pack: keep poll(2)'s timeout to -1
- From
Edward Thomson <ethomson@edwardthomson.com>
- Date
- Aug 22, 2014, 15:19 UTC
- Message-ID
- <20140822151911.GA8531@debian>
Keep poll's timeout at -1 when uploadpack.keepalive = 0, instead of setting it to -1000, since some pedantic old systems (eg HP-UX) and the gnulib compat/poll will treat only -1 as the valid value for an infinite timeout.
Signed-off-by: Edward Thomson <ethomson@microsoft.com> --- upload-pack.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/upload-pack.c b/upload-pack.c index 01de944..433211a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -167,7 +167,9 @@ static void create_pack_file(void) if (!pollsize) break; - ret = poll(pfd, pollsize, 1000 * keepalive); + ret = poll(pfd, pollsize, + keepalive < 0 ? -1 : 1000 * keepalive); + if (ret < 0) { if (errno != EINTR) { error("poll failed, resuming: %s",
-- 1.7.10.4