From 6f442a4a7a66a0ba6d5189a0430cd5e95fb39ea8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 16:07:04 -0500
Subject: [PATCH] Automatically adjust web.forwardSlash on Tomcat containers

---
 src/main/java/com/gitblit/GitBlit.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index f191d6a..97372e1 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3554,8 +3554,6 @@
 		configureFanout();
 		configureGitDaemon();
 		configureCommitCache();
-
-		ContainerUtils.CVE_2007_0450.test();
 	}
 
 	protected void configureMailExecutor() {
@@ -3817,6 +3815,10 @@
 				FileSettings settings = new FileSettings(localSettings.getAbsolutePath());
 				configureContext(settings, base, true);
 			}
+
+			// WAR or Express is likely to be running on a Tomcat.
+			// Test for the forward-slash/%2F issue and auto-adjust settings.
+			ContainerUtils.CVE_2007_0450.test(settings);
 		}
 
 		settingsModel = loadSettingModels();

--
Gitblit v1.9.1