Further clean-up: usage() vs die()

[git.git] / upload-pack.c

diff --git a/upload-pack.c b/upload-pack.c
index 2e820c9c85cf750d57760251aa62237a5173c526..07ecdb4281cfb32cf16dfc7c46c53e6e8d0247bc 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -51,6 +51,10 @@ static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
                if (fd == 3)
                        /* emergency quit */
                        fd = 2;
+               if (fd == 2) {
+                       xwrite(fd, data, sz);
+                       return sz;
+               }
                return safe_write(fd, data, sz);
        }
        p = data;
@@ -178,6 +182,8 @@ static void create_pack_file(void)
                ssize_t sz;
                int pe, pu, pollsize;
 
+               reset_timeout();
+
                pollsize = 0;
                pe = pu = -1;