From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 26 Apr 2017 11:08:22 +0000 (+0100)
Subject: git-cache-proxy: Do not spuriously timeout on too many simultaneous invocations
X-Git-Tag: archive/debian/6.0.0~14^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=9f36b90fd7a758bb7e0e1534ea2c7adadac4123e;hp=eb05b0b50a2048ed460c9f345c657014b245fd20

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 0b673ab..2920e86 100644
--- 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 3e57a4f..e87a803 100755
--- 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: $!";