summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Kelly <doug.kelly@garmin.com>2015-04-02 15:15:36 -0500
committerDoug Kelly <doug.kelly@garmin.com>2015-04-02 15:15:36 -0500
commit2e7965f9a18539d8f311035ddd1f88831c402068 (patch)
treece1aa5dc46a05cd99c06f71d06f4f61461bf7dcc
parent329c32347336214b496f2846d05a80fe927c673e (diff)
Remove stripping # in login redirect
The login redirect was set up to strip '#/' when redirecting to the login page. In 2.10, HttpLoginServlet assumed the URL already contained '#/', which means the redirect back to the original page after login would fail. Bug: Issue 3044 Change-Id: I5dc297e31d26006f52f869a63e5b9cc6f9591b21
-rw-r--r--gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html5
1 files changed, 1 insertions, 4 deletions
diff --git a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html
index d88af9a42f..0567468e8c 100644
--- a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html
+++ b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html
@@ -7,10 +7,7 @@
var p = href.indexOf('#');
var token;
if (p >= 0) {
- token = href.substring(p + 1);
- if (token.length != 0 && token.charAt(0) == '/') {
- token = token.substring(1);
- }
+ token = href.substring(p);
href = href.substring(0, p);
} else {
token = '';