From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001 From: Eddy Young <jeyoung@priscimon.com> Date: Fri, 22 May 2015 03:47:09 -0400 Subject: [PATCH] Merge branch 'develop' into ticket-57_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