X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=scripts%2Fgit-cache-proxy;h=52e01d0203b0e210200119cb42b57eea76ff7dbb;hb=ba11d4679a8024bc26066ec7fd6bc30bb54967c8;hp=e87a80329e313663515e8d23f96c8083335ca1d1;hpb=9f36b90fd7a758bb7e0e1534ea2c7adadac4123e;p=chiark-utils.git

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index e87a803..52e01d0 100755
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -30,6 +30,7 @@
 # git-cache-proxy
 # Copyright 2010 Tony Finch
 # Copyright 2013,2014 Ian Jackson
+# Copyright 2017 Citrix
 # 
 # git-cache-proxy is free software; you can redistribute it and/or
 # modify them under the terms of the GNU General Public License as
@@ -64,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;
 
@@ -171,6 +173,7 @@ for (;;) {
 	    $cachedir = $1;
 	} elsif (s/^--( max-fetch-timeout
                       | fetch-timeout
+                      | serve-timeout
                       | tree-expire-days
                       | housekeeping-interval-days
                       )=(\d+)$//x) {
@@ -476,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: $!";
 }