Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-13 22:51:08 -05:00
Code Issues Activity

Refactored proxy middleware to return errors

Browse source
This commit is contained in:
Matthew Holt 2015-03-28 16:56:56 -06:00
parent 076d4e0ec5
commit 6bf36d922c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
middleware/proxy/proxy.go
View file

@ -24,8 +24,8 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
rules = append(rules, rule) rules = append(rules, rule)
} }
return func(next http.HandlerFunc) http.HandlerFunc { return func(next middleware.HandlerFunc) middleware.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) (int, error) {
for _, rule := range rules { for _, rule := range rules {
if middleware.Path(r.URL.Path).Matches(rule.from) { if middleware.Path(r.URL.Path).Matches(rule.from) {
@ -45,11 +45,11 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
// TODO: Construct this before; not during every request, if possible // TODO: Construct this before; not during every request, if possible
proxy := httputil.NewSingleHostReverseProxy(baseUrl) proxy := httputil.NewSingleHostReverseProxy(baseUrl)
proxy.ServeHTTP(w, r) proxy.ServeHTTP(w, r)
return 0, nil
}
}
} else { return next(w, r)
next(w, r)
}
}
} }
}, nil }, nil
} }