Merge remote-tracking branch 'mariner/master'

diff --git a/debian/changelog b/debian/changelog
index 17463aacdecb0d4ce1766123b57f71a9d78eda54..1611b8089fbeaaa4d7124abf9f3963fb287d2841 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+chiark-utils (5.0.3~) unstable; urgency=medium
+
+  * git-cache-proxy: Do not spuriously timeout on too many simultaneous
+    invocations (specifically, do not timeout when reacquiring the lock
+    before serving).
+
+ -- 
+
 chiark-utils (5.0.2) unstable; urgency=medium
 
   * Portability fix: Fix on libcs where st_mtime is not a macro

diff --git a/debian/copyright b/debian/copyright
index 37bb1961dd69e51fc3fffaecb1a8b2f32ee9767e..f629a2304eda883e3d096fb7b9627e5845ada3cd 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,6 +37,8 @@ xduplic-copier, a simple X client for typing into multiple windows
 
 git-cache-proxy, a rather shoddy daemon for speeding up git clone
  Copyright 2013 Ian Jackson <ian@chiark.greenend.org.uk>
+ Copyright 2010 Tony Finch
+ Copyright 2017 Citrix
 
 summer, a tool for reporting complete details about a filesystem tree
  Copyright 2003-2007 Ian Jackson <ian@chiark.greenend.org.uk>

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