Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 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)) {