Make maximal use of the remote refs

[git.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index c3381b3..c3f8641 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,3 @@
-#include "cache.h"
-#include "pkt-line.h"
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
@@ -9,6 +7,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
+#include "pkt-line.h"
+#include "cache.h"
 
 static int log_syslog;
 static int verbose;
@@ -145,11 +145,11 @@ static int set_dir(const char *dir)
 
        if ( chdir(dir) )
                return -1;
-       
+
        /*
         * 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.
         */
@@ -529,11 +529,11 @@ static int service_loop(int socknum, int *socklist)
        }
 
        signal(SIGCHLD, child_handler);
-       
+
        for (;;) {
                int i;
 
-               if (poll(pfd, socknum, 0) < 0) {
+               if (poll(pfd, socknum, -1) < 0) {
                        if (errno != EINTR) {
                                error("poll failed, resuming: %s",
                                      strerror(errno));
@@ -566,13 +566,13 @@ static int service_loop(int socknum, int *socklist)
 static int serve(int port)
 {
        int socknum, *socklist;
-       
+
        socknum = socksetup(port, &socklist);
        if (socknum == 0)
                die("unable to allocate any listen sockets on port %u", port);
-       
+
        return service_loop(socknum, socklist);
-}      
+}
 
 int main(int argc, char **argv)
 {
@@ -612,7 +612,7 @@ int main(int argc, char **argv)
                if (!strncmp(arg, "--timeout=", 10)) {
                        timeout = atoi(arg+10);
                }
-               if (!strncmp(arg, "--init-timeout=", 10)) {
+               if (!strncmp(arg, "--init-timeout=", 15)) {
                        init_timeout = atoi(arg+15);
                }
                if (!strcmp(arg, "--")) {