diff options
author | James Moger <james.moger@gitblit.com> | 2014-01-04 08:05:28 -0800 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-01-04 08:05:28 -0800 |
commit | 814e248354ed9b234c59e3470ef363f705bf711a (patch) | |
tree | 2963342ddca1de47d254c7a3d5a262c8c0b85efa /src/main/java | |
parent | d1cb28385ea59475884afebd00179406c207efff (diff) | |
parent | 399b9b6769908f98e4dfb9658d3f9fae0ee03719 (diff) | |
download | gitblit-814e248354ed9b234c59e3470ef363f705bf711a.tar.gz gitblit-814e248354ed9b234c59e3470ef363f705bf711a.zip |
Merge pull request #130 from asbachb/master
Evaluate X_Forwarded_Context only when X-Forwarded-Context is not set
Diffstat (limited to 'src/main/java')
-rw-r--r-- | 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 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)) {
|