stephen/caddy-hugo2
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

fixing host matching in caddy integration

Browse Source
This commit is contained in:
stephen
2017-09-07 16:59:34 -05:00
parent 55d2ac2b97
commit 1196033364
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http.go
+6 -4
View File
@@ -109,9 +109,10 @@ func (ch *CaddyHugo) ServeNewContent(w http.ResponseWriter, r *http.Request) (in
func (ch *CaddyHugo) Middleware(c *caddy.Controller) httpserver.Middleware { func (ch *CaddyHugo) Middleware(c *caddy.Controller) httpserver.Middleware {
return func(next httpserver.Handler) httpserver.Handler { return func(next httpserver.Handler) httpserver.Handler {
host := net.JoinHostPort(ch.Site.Addr.Host, ch.Site.Addr.Port) host := ch.Site.Addr.Host
hostport := net.JoinHostPort(ch.Site.Addr.Host, ch.Site.Addr.Port)
return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) { return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
if r.Host != host { if r.Host != host && r.Host != hostport {
return next.ServeHTTP(w, r) return next.ServeHTTP(w, r)
} }
return ch.ServeHTTPWithNext(next, w, r) return ch.ServeHTTPWithNext(next, w, r)
@@ -125,8 +126,9 @@ func (ch *CaddyHugo) Auth(r *http.Request) bool {
} }
func (ch *CaddyHugo) Match(r *http.Request) bool { func (ch *CaddyHugo) Match(r *http.Request) bool {
host := net.JoinHostPort(ch.Site.Addr.Host, ch.Site.Addr.Port) host := ch.Site.Addr.Host
if r.Host != host { hostport := net.JoinHostPort(ch.Site.Addr.Host, ch.Site.Addr.Port)
if r.Host != host && r.Host != hostport {
return false return false
} }
if strings.HasPrefix(r.URL.Path, "/media/") { if strings.HasPrefix(r.URL.Path, "/media/") {
testdir/caddyfile
+1 -1
View File
@@ -7,7 +7,7 @@ localhost:8080 {
pprof pprof
} }
localhost:8081 { localhost:8081, localhost:8082 {
root ./testsite2 root ./testsite2
hugo hugo
errors { * } errors { * }