Merge branch 'master' into master

This commit is contained in:
Bo-Yi Wu 2017-08-24 20:01:46 -05:00 committed by GitHub
commit 4304c2f28d

7
gin.go
View File

@ -316,14 +316,11 @@ func (engine *Engine) HandleContext(c *Context) {
func (engine *Engine) handleHTTPRequest(context *Context) { func (engine *Engine) handleHTTPRequest(context *Context) {
httpMethod := context.Request.Method httpMethod := context.Request.Method
var path string path := context.Request.URL.Path
var unescape bool unescape := false
if engine.UseRawPath && len(context.Request.URL.RawPath) > 0 { if engine.UseRawPath && len(context.Request.URL.RawPath) > 0 {
path = context.Request.URL.RawPath path = context.Request.URL.RawPath
unescape = engine.UnescapePathValues unescape = engine.UnescapePathValues
} else {
path = context.Request.URL.Path
unescape = false
} }
// Find root of the tree for the given HTTP method // Find root of the tree for the given HTTP method