From 8df3a80fb8cd2b280d3b0b7d809ad80c1d0be236 Mon Sep 17 00:00:00 2001 From: Felipe Madrigal Date: Fri, 26 Sep 2014 00:20:12 -0500 Subject: [PATCH] Rearrange getHost function --- regexp.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/regexp.go b/regexp.go index ef1db8f..35c8177 100644 --- a/regexp.go +++ b/regexp.go @@ -262,13 +262,14 @@ func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) // getHost tries its best to return the request host. func getHost(r *http.Request) string { - if !r.URL.IsAbs() { - host := r.Host - // Slice off any port information. - if i := strings.Index(host, ":"); i != -1 { - host = host[:i] - } - return host + if r.URL.IsAbs() { + return r.URL.Host + } + host := r.Host + // Slice off any port information. + if i := strings.Index(host, ":"); i != -1 { + host = host[:i] } - return r.URL.Host + return host + }