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 ffea81cdae9f9b6d6e8d368804fffc67a6134030..818ed492beb463d263c1fc185359b6da0c1f0e50 100644 (file)
--- 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 {
 \r
         String context = request.getContextPath();\r
         String forwardedContext = request.getHeader("X-Forwarded-Context");\r
-        if (forwardedContext != null) {\r
+        if (StringUtils.isEmpty(forwardedContext)) {\r
                forwardedContext = request.getHeader("X_Forwarded_Context");\r
         }\r
         if (!StringUtils.isEmpty(forwardedContext)) {\r