#208 fixed redirect issue

go-aah · Aug 18, 2018 · 353d858 · 353d858
1 parent da81cf3
commit 353d858
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/aah.go b/aah.go
@@ -586,8 +586,9 @@ func (a *app) aahRecover() {
 func (a *app) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	defer a.aahRecover()
 	if a.redirect {
-		a.he.doRedirect(w, r)
-		return
+		if a.he.doRedirect(w, r) {
+			return
+		}
 	}
 
 	upgrade := r.Header.Get(ahttp.HeaderUpgrade)

diff --git a/http_engine.go b/http_engine.go
@@ -432,7 +432,7 @@ const (
 	nonwww = "non-www"
 )
 
-func (e *HTTPEngine) doRedirect(w http.ResponseWriter, r *http.Request) {
+func (e *HTTPEngine) doRedirect(w http.ResponseWriter, r *http.Request) bool {
 	cfg := e.a.Config()
 	redirectTo := cfg.StringDefault("server.redirect.to", nonwww)
 	redirectCode := cfg.IntDefault("server.redirect.code", http.StatusMovedPermanently)
@@ -442,10 +442,14 @@ func (e *HTTPEngine) doRedirect(w http.ResponseWriter, r *http.Request) {
 	case www:
 		if host[:3] != www {
 			http.Redirect(w, r, ahttp.Scheme(r)+"://www."+host+r.URL.RequestURI(), redirectCode)
+			return true
 		}
+
 	case nonwww:
 		if host[:3] == www {
 			http.Redirect(w, r, ahttp.Scheme(r)+"://"+host[4:]+r.URL.RequestURI(), redirectCode)
+			return true
 		}
 	}
+	return false
 }