From 1d12e2c7fa1d1858caa4ef456cfc699a026a2fbe Mon Sep 17 00:00:00 2001
From: Sasa Zivkov <sasa.zivkov@sap.com>
Date: Mon, 15 Jul 2013 16:47:30 +0200
Subject: [PATCH] Honor gerrit.cannonicalWebUrl when opening browser after
 init.

Change-Id: I69040f478394dcc4e28eec6e33729fb06690679f
---
 .../java/com/google/gerrit/pgm/init/Browser.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
index 8e3948e424..96ab1030e4 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
@@ -39,12 +39,15 @@ public class Browser {
   }
 
   public void open(final String link) throws Exception {
-    String url = cfg.getString("httpd", null, "listenUrl");
+    String url = cfg.getString("gerrit", null, "canonicalWebUrl");
     if (url == null) {
-      return;
-    }
-    if (url.startsWith("proxy-")) {
-      url = url.substring("proxy-".length());
+      url = cfg.getString("httpd", null, "listenUrl");
+      if (url == null) {
+        return;
+      }
+      if (url.startsWith("proxy-")) {
+        url = url.substring("proxy-".length());
+      }
     }
 
     final URI uri;