Fixed sub-group virtual hosts

vishr · vishr · commit 8c13b9dae2a0 · 2019-04-28T23:10:00.000-07:00
diff --git a/echo.go b/echo.go
@@ -225,7 +225,7 @@ const (
 
 const (
 	// Version of Echo
-	Version = "4.1.0"
+	Version = "4.1.2"
 	website = "https://echo.labstack.com"
 	// http://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Echo
 	banner = `
diff --git a/group.go b/group.go
@@ -93,11 +93,13 @@ func (g *Group) Match(methods []string, path string, handler HandlerFunc, middle
 }
 
 // Group creates a new sub-group with prefix and optional sub-group-level middleware.
-func (g *Group) Group(prefix string, middleware ...MiddlewareFunc) *Group {
+func (g *Group) Group(prefix string, middleware ...MiddlewareFunc) (sg *Group) {
 	m := make([]MiddlewareFunc, 0, len(g.middleware)+len(middleware))
 	m = append(m, g.middleware...)
 	m = append(m, middleware...)
-	return g.echo.Group(g.prefix+prefix, m...)
+	sg = g.echo.Group(g.prefix+prefix, m...)
+	sg.host = g.host
+	return
 }
 
 // Static implements `Echo#Static()` for sub-routes within the Group.

Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,13 @@ func (g *Group) Match(methods []string, path string, handler HandlerFunc, middle`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// Group creates a new sub-group with prefix and optional sub-group-level middleware.`
`96`		`-func (g Group) Group(prefix string, middleware ...MiddlewareFunc) Group {`
	`96`	`+func (g Group) Group(prefix string, middleware ...MiddlewareFunc) (sg Group) {`
`97`	`97`	`m := make([]MiddlewareFunc, 0, len(g.middleware)+len(middleware))`
`98`	`98`	`m = append(m, g.middleware...)`
`99`	`99`	`m = append(m, middleware...)`
`100`		`- return g.echo.Group(g.prefix+prefix, m...)`
	`100`	`+ sg = g.echo.Group(g.prefix+prefix, m...)`
	`101`	`+ sg.host = g.host`
	`102`	`+ return`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	// Static implements `Echo#Static()` for sub-routes within the Group.