pack-objects: use reachability bitmap index when generating non-stdout pack

diff --git a/daemon.c b/daemon.c
index f2bc7f43f61e4c13125f00c6fa92db43590b25fc..e647254c196f8270691cd369b51ac5132add1259 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -668,6 +668,15 @@ static void hostinfo_clear(struct hostinfo *hi)
        strbuf_release(&hi->tcp_port);
 }
 
+static void set_keep_alive(int sockfd)
+{
+       int ka = 1;
+
+       if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &ka, sizeof(ka)) < 0)
+               logerror("unable to set SO_KEEPALIVE on socket: %s",
+                       strerror(errno));
+}
+
 static int execute(void)
 {
        char *line = packet_buffer;
@@ -680,6 +689,7 @@ static int execute(void)
        if (addr)
                loginfo("Connection from %s:%s", addr, port);
 
+       set_keep_alive(0);
        alarm(init_timeout ? init_timeout : timeout);
        pktlen = packet_read(0, NULL, NULL, packet_buffer, sizeof(packet_buffer), 0);
        alarm(0);
@@ -950,6 +960,8 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
                        continue;
                }
 
+               set_keep_alive(sockfd);
+
                if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
                        logerror("Could not bind to %s: %s",
                                 ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),
@@ -1009,6 +1021,8 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis
                return 0;
        }
 
+       set_keep_alive(sockfd);
+
        if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {
                logerror("Could not bind to %s: %s",
                         ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),
@@ -1187,8 +1201,6 @@ int cmd_main(int argc, const char **argv)
        struct credentials *cred = NULL;
        int i;
 
-       git_setup_gettext();
-
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
                const char *v;
@@ -1364,8 +1376,7 @@ int cmd_main(int argc, const char **argv)
        if (detach) {
                if (daemonize())
                        die("--detach not supported on this platform");
-       } else
-               sanitize_stdfds();
+       }
 
        if (pid_file)
                write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid());