mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 18:32:37 +02:00
Code

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

Browse Source 
* et/spell-poll-infinite-with-minus-one-only:
  upload-pack: keep poll(2)'s timeout to -1
This commit is contained in:
Junio C Hamano 2014-09-19 14:05:13 -07:00
commit b8f7239058
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upload-pack.c
View File

@ -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",