From 318897758a14c4dc356df690b4021c388fe6e9e6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 Feb 2015 10:03:06 -0500
Subject: [PATCH] Merge branch 'ticket/241' into develop

---
 src/main/java/com/gitblit/utils/HttpUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/utils/HttpUtils.java b/src/main/java/com/gitblit/utils/HttpUtils.java
index ffea81c..818ed49 100644
--- a/src/main/java/com/gitblit/utils/HttpUtils.java
+++ b/src/main/java/com/gitblit/utils/HttpUtils.java
@@ -80,7 +80,7 @@
 
         String context = request.getContextPath();
         String forwardedContext = request.getHeader("X-Forwarded-Context");
-        if (forwardedContext != null) {
+        if (StringUtils.isEmpty(forwardedContext)) {
         	forwardedContext = request.getHeader("X_Forwarded_Context");
         }
         if (!StringUtils.isEmpty(forwardedContext)) {

--
Gitblit v1.9.1