X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fgit-cache-proxy;h=ffdf6eab52fe57bad3b276ad71a21002abc5011e;hp=647f6b60d3c152dae98a16240f0bf9181dcee86b;hb=2b42677fc027af957b8622b38da698c4f50f41ae;hpb=b29db042447c2b79fc3b9fc95c2602daeee3f5c6;ds=sidebyside

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 647f6b6..ffdf6ea 100755
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -67,6 +67,7 @@ our $housekeepingeverydays = 1;
 our $treeexpiredays = 21;
 our $fetchtimeout = 1800;
 our $maxfetchtimeout = 3600;
+our $servetimeout = 1000;
 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: $!";
 }