diff options
author | Junio C Hamano <junkio@cox.net> | 2005-10-21 06:19:47 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-10-21 06:19:47 (GMT) |
commit | f6804930cae3ccf48b200264bdb7a25b4382d454 (patch) | |
tree | a161b324fef1613f1a0abcae3172c4b83b3a25a7 | |
parent | 147a1ab03599c21c9e5972739c460fd2635c0c02 (diff) | |
parent | a935c3972749095e7ea6c341e539a94de705ecfd (diff) | |
download | git-f6804930cae3ccf48b200264bdb7a25b4382d454.zip git-f6804930cae3ccf48b200264bdb7a25b4382d454.tar.gz git-f6804930cae3ccf48b200264bdb7a25b4382d454.tar.bz2 |
Merge branch 'fixes'
-rw-r--r-- | daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -148,7 +148,7 @@ static int set_dir(const char *dir) /* * 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 * is ok with us doing this. */ @@ -491,7 +491,7 @@ static int serve(int port) for (;;) { int i; fds = fds_init; - + if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) { if (errno != EINTR) { error("select failed, resuming: %s", |