1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 15:04:49 +01:00

Merge branch 'fixes'

This commit is contained in:
Junio C Hamano 2005-10-20 23:19:47 -07:00
commit f6804930ca

View file

@ -148,7 +148,7 @@ static int set_dir(const char *dir)
/* /*
* Security on the cheap. * Security on the cheap.
* *
* We want a readable HEAD, usable "objects" directory, and * We want a readable HEAD, usable "objects" directory, and
* a "git-daemon-export-ok" flag that says that the other side * a "git-daemon-export-ok" flag that says that the other side
* is ok with us doing this. * is ok with us doing this.
*/ */
@ -491,7 +491,7 @@ static int serve(int port)
for (;;) { for (;;) {
int i; int i;
fds = fds_init; fds = fds_init;
if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) { if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) {
if (errno != EINTR) { if (errno != EINTR) {
error("select failed, resuming: %s", error("select failed, resuming: %s",