git-cache-proxy: Do not spuriously timeout on too many simultaneous invocations

Specifically, do not timeout when reacquiring the lock before serving.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/debian/changelog b/debian/changelog
index 0b673ab9fca97faaeef12144ad0f34e1cf75c26c..2920e862c4b8e2b4d09ce9b1f5a77924d6ce8418 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 chiark-utils (5.0.1~) unstable; urgency=medium
 
   * with-lock-ex: provide -l
+  * git-cache-proxy: Do not spuriously timeout on too many simultaneous
+    invocations (specifically, do not timeout when reacquiring the lock
+    before serving).
 
  --
 

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 3e57a4f5530e2971794dd3a82612590421624c8e..e87a80329e313663515e8d23f96c8083335ca1d1 100755 (executable)
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -360,6 +360,7 @@ sub clonefetch () {
                servinfo "fetch/clone failed: $fetchfail";
            }
        }
+        alarm 0;
 
        if (!$exists) {
            rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!";