Merge branch 'develop' into performance

Conflicts:
	context.go
	context_test.go
	gin_test.go
	recovery_test.go
	utils.go
This commit is contained in:
Manu Mtz-Almeida
2015-04-08 13:37:25 +02:00
18 changed files with 971 additions and 102 deletions

View File

@ -103,11 +103,11 @@ func (group *RouterGroup) UNLINK(relativePath string, handlers ...HandlerFunc) {
func (group *RouterGroup) Static(relativePath, root string) {
absolutePath := group.calculateAbsolutePath(relativePath)
handler := group.createStaticHandler(absolutePath, root)
absolutePath = path.Join(absolutePath, "/*filepath")
relativePath = path.Join(relativePath, "/*filepath")
// Register GET and HEAD handlers
group.GET(absolutePath, handler)
group.HEAD(absolutePath, handler)
group.GET(relativePath, handler)
group.HEAD(relativePath, handler)
}
func (group *RouterGroup) createStaticHandler(absolutePath, root string) func(*Context) {