git: add potential workaround of keepalive race

[chef.git] / cookbooks / git / templates / default / apache.erb

diff --git a/cookbooks/git/templates/default/apache.erb b/cookbooks/git/templates/default/apache.erb
index 9ec36f7d85a72d771cdfb238ce1c080c7cd670c9..5aa08f465434944c4eddaba8a5acc675385d46d9 100644 (file)
--- a/cookbooks/git/templates/default/apache.erb
+++ b/cookbooks/git/templates/default/apache.erb
@@ -47,6 +47,9 @@
         SetEnv GIT_PROJECT_ROOT /var/lib/git
         SetEnv GIT_HTTP_EXPORT_ALL
 
+        # Keepalive should be larger than git config uploadpack.keepalive to avoid potential race on slower links
+        KeepAliveTimeout 60
+
         ScriptAlias /public /usr/lib/git-core/git-http-backend/public
         ScriptAlias /private /usr/lib/git-core/git-http-backend/private
         Alias /gitweb /usr/share/gitweb