Merge pull request #6 from mbanzon/master

kisielk · kisielk · commit 2090ee10e241 · 2015-08-09T19:21:02.000-07:00
KeepContext respected
diff --git a/pat.go b/pat.go
@@ -71,7 +71,9 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		}
 		handler = r.NotFoundHandler
 	}
-	defer context.Clear(req)
+	if !r.KeepContext {
+		defer context.Clear(req)
+	}
 	handler.ServeHTTP(w, req)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ func (r Router) ServeHTTP(w http.ResponseWriter, req http.Request) {`
`71`	`71`	`}`
`72`	`72`	`handler = r.NotFoundHandler`
`73`	`73`	`}`
`74`		`- defer context.Clear(req)`
	`74`	`+ if !r.KeepContext {`
	`75`	`+ defer context.Clear(req)`
	`76`	`+ }`
`75`	`77`	`handler.ServeHTTP(w, req)`
`76`	`78`	`}`
`77`	`79`