From: Benjamin Asbach <asbachb@benjamins-mbp.fritz.box>
Date: Sat, 4 Jan 2014 15:29:12 +0000 (+0100)
Subject: Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
X-Git-Tag: v1.4.0~132^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=399b9b6769908f98e4dfb9658d3f9fae0ee03719;p=gitblit.git

Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
---

diff --git a/src/main/java/com/gitblit/utils/HttpUtils.java b/src/main/java/com/gitblit/utils/HttpUtils.java
index ffea81cd..818ed492 100644
--- a/src/main/java/com/gitblit/utils/HttpUtils.java
+++ b/src/main/java/com/gitblit/utils/HttpUtils.java
@@ -80,7 +80,7 @@ public class HttpUtils {
 
         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)) {