opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.13'"

Browse Source
This commit is contained in:
ekempin
2016-12-19 12:33:03 +00:00
committed by Gerrit Code Review
parent 047e678957 8ff786597e
commit 81f334a77f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitwebServlet.java
View File

@@ -238,7 +238,10 @@ class GitwebServlet extends HttpServlet {
p.print(" if (( $secure && $ENV{'SERVER_PORT'} != 443)\n"); p.print(" if (( $secure && $ENV{'SERVER_PORT'} != 443)\n");
p.print(" || (!$secure && $ENV{'SERVER_PORT'} != 80)\n"); p.print(" || (!$secure && $ENV{'SERVER_PORT'} != 80)\n");
p.print(" );\n"); p.print(" );\n");
p.print(" $http_url .= qq{$ENV{'GERRIT_CONTEXT_PATH'}p};\n"); p.print(" $http_url .= qq{$ENV{'GERRIT_CONTEXT_PATH'}};\n");
p.print(" $http_url .= qq{/a}\n");
p.print(" unless $ENV{'GERRIT_ANONYMOUS_READ'};\n");
p.print(" \n");
p.print(" push @git_base_url_list, $http_url;\n"); p.print(" push @git_base_url_list, $http_url;\n");
p.print("}\n"); p.print("}\n");
@@ -548,7 +551,7 @@ class GitwebServlet extends HttpServlet {
env.set("HTTP_" + name.toUpperCase().replace('-', '_'), value); env.set("HTTP_" + name.toUpperCase().replace('-', '_'), value);
} }
env.set("GERRIT_CONTEXT_PATH", req.getContextPath() + "/"); env.set("GERRIT_CONTEXT_PATH", req.getContextPath());
env.set("GERRIT_PROJECT_NAME", project.getProject().getName()); env.set("GERRIT_PROJECT_NAME", project.getProject().getName());
env.set("GITWEB_PROJECTROOT", env.set("GITWEB_PROJECTROOT",