diff options
author | Shawn O. Pearce <sop@google.com> | 2009-06-02 18:40:19 -0700 |
---|---|---|
committer | Shawn O. Pearce <sop@google.com> | 2009-06-02 18:40:19 -0700 |
commit | bb0f51d0e7a27ccde26453113c531086b0da69fb (patch) | |
tree | 46e2d938ca797c1c305f2b2e24b381c12639238b | |
parent | 9ba6aa6b0c39f8b3cf35cc9797897beccd6ee417 (diff) |
Use server name for ssh_info instead of local address
If we are behind an Apache2 reverse proxy, getLocalAddr returns
127.0.0.1, which is not an address that a client can use to
connect to us. Instead we should use the hostname the client
asked Apache for in the HTTP headers, as that is still present
as getServerName().
Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r-- | src/main/java/com/google/gerrit/server/ssh/SshServlet.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/gerrit/server/ssh/SshServlet.java b/src/main/java/com/google/gerrit/server/ssh/SshServlet.java index 97170b1c2f..01df417fed 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshServlet.java +++ b/src/main/java/com/google/gerrit/server/ssh/SshServlet.java @@ -85,7 +85,7 @@ public class SshServlet extends HttpServlet { final InetAddress ip = addr.getAddress(); String host; if (ip != null && ip.isAnyLocalAddress()) { - host = req.getLocalAddr(); + host = req.getServerName(); } else if (ip instanceof Inet6Address) { host = "[" + addr.getHostName() + "]"; } else { |