1
0
mirror of https://github.com/labstack/echo.git synced 2024-11-24 08:22:21 +02:00

Fixed broken build

Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2015-04-02 15:15:09 -07:00
parent de6644a17b
commit 127486b3eb

13
echo.go
View File

@ -98,10 +98,10 @@ func (e *Echo) Sub(pfx string) *Echo {
// Group is simmilar to Sub but excludes inheriting middleware from the parent // Group is simmilar to Sub but excludes inheriting middleware from the parent
// router. // router.
func (e *Echo) Group(pfx string) *Echo { func (e *Echo) Group(pfx string) *Echo {
s := *e g := *e
s.prefix = pfx g.prefix = pfx
s.middleware = nil g.middleware = nil
return &s return &g
} }
// MaxParam sets the maximum allowed path parameters. Default is 5, good enough // MaxParam sets the maximum allowed path parameters. Default is 5, good enough
@ -202,7 +202,10 @@ func (e *Echo) Index(file string) {
} }
func (e *Echo) ServeHTTP(rw http.ResponseWriter, r *http.Request) { func (e *Echo) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
h, c, e := e.Router.Find(r.Method, r.URL.Path) h, c, echo := e.Router.Find(r.Method, r.URL.Path)
if echo != nil {
e = echo
}
if h == nil { if h == nil {
h = e.notFoundHandler h = e.notFoundHandler
} }