Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maint

* et/spell-poll-infinite-with-minus-one-only: upload-pack: keep poll(2)'s timeout to -1
git-mirror · Sep 19, 2014 · b8f7239 · b8f7239
2 parents 08fd8a0 + 6c71f8b
commit b8f7239
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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",