Automatically disable the Git daemon on Express

Change-Id: Ide78d4c5db59a734060ce527a59450eed8433c1a

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 97372e11b7f1ce78b54d68a217764d392ef9f64e..6d52e763dff8ef901b49aa904097dacce7c2c457 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3772,6 +3772,10 @@ public class GitBlit implements ServletContextListener {
                                        }
                                }
 
+                               // disable Git daemon on Express - we can't bind 9418 and we
+                               // can't port-forward to the daemon
+                               webxmlSettings.overrideSetting(Keys.git.daemonPort, 0);
+
                                // configure context using the web.xml
                                configureContext(webxmlSettings, base, true);
                        } else {