github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-06 11:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1555 from weaveworks/improve-rewrites

Browse Source 
Rewrite net/http.Request.{URL.Path,RequestURI} consistently
This commit is contained in:
Alfonso Acosta
2016-06-08 10:56:42 +01:00
parent 7c4b7a56cb 116943f184
commit 001daf9ecd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/middleware/path_rewrite.go
View File

@@ -21,7 +21,7 @@ type pathRewrite struct {
func (p pathRewrite) Wrap(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
r.RequestURI = p.regexp.ReplaceAllString(r.RequestURI, p.replacement)
r.URL.Path = p.regexp.ReplaceAllString(r.RequestURI, p.replacement)
r.URL.Path = p.regexp.ReplaceAllString(r.URL.Path, p.replacement)
next.ServeHTTP(w, r)
})
}
@@ -35,6 +35,7 @@ type pathReplace string
func (p pathReplace) Wrap(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
r.URL.Path = string(p)
r.RequestURI = string(p)
next.ServeHTTP(w, r)
})