fishdescriptor: before redo option parsing

[chiark-utils.git] / scripts / git-cache-proxy

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 647f6b60d3c152dae98a16240f0bf9181dcee86b..52e01d0203b0e210200119cb42b57eea76ff7dbb 100755 (executable)
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -65,8 +65,9 @@ our $us = 'git-cache-proxy';
 our $debug = 0;
 our $housekeepingeverydays = 1;
 our $treeexpiredays = 21;
-our $fetchtimeout = 1800;
-our $maxfetchtimeout = 3600;
+our $fetchtimeout = 3600;
+our $maxfetchtimeout = 7200;
+our $servetimeout = 3600;
 our $cachedir = '/var/cache/git-cache-proxy';
 our $housekeepingonly = 0;
 
@@ -172,6 +173,7 @@ for (;;) {
            $cachedir = $1;
        } elsif (s/^--( max-fetch-timeout
                       | fetch-timeout
+                      | serve-timeout
                       | tree-expire-days
                       | housekeeping-interval-days
                       )=(\d+)$//x) {
@@ -477,7 +479,7 @@ sub runcommand () {
 
     chdir $gitd or fail "chdir $gitd: $!";
 
-    exec qw(git-upload-pack --strict --timeout=1000 .)
+    exec qw(git-upload-pack --strict), "--timeout=$servetimeout", qw(.)
        or fail "exec git-upload-pack: $!";
 }