Matthew Holt
6 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
13 changed files with
23 additions and
23 deletions
-
caddy.go
-
go.mod
-
go.sum
-
modules/caddyhttp/encode/brotli/brotli.go
-
modules/caddyhttp/encode/caddyfile.go
-
modules/caddyhttp/encode/gzip/gzip.go
-
modules/caddyhttp/encode/zstd/zstd.go
-
modules/caddyhttp/fileserver/caddyfile.go
-
modules/caddyhttp/fileserver/matcher.go
-
modules/caddyhttp/headers/caddyfile.go
-
modules/caddyhttp/reverseproxy/module.go
-
modules/caddyhttp/rewrite/caddyfile.go
-
modules/caddyhttp/templates/caddyfile.go
|
|
@ -227,10 +227,10 @@ func goModule(mod *debug.Module) *debug.Module { |
|
|
|
// once that issue is fixed, we should just be able to use bi.Main... hopefully.
|
|
|
|
for _, dep := range bi.Deps { |
|
|
|
if dep.Path == mod.Path { |
|
|
|
return *dep |
|
|
|
return dep |
|
|
|
} |
|
|
|
} |
|
|
|
return bi.Main |
|
|
|
return &bi.Main |
|
|
|
} |
|
|
|
return mod |
|
|
|
} |
|
|
|
|
|
@ -16,7 +16,7 @@ require ( |
|
|
|
github.com/imdario/mergo v0.3.7 // indirect |
|
|
|
github.com/klauspost/compress v1.7.1-0.20190613161414-0b31f265a57b |
|
|
|
github.com/klauspost/cpuid v1.2.1 |
|
|
|
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 |
|
|
|
github.com/mholt/certmagic v0.6.2 |
|
|
|
github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936 |
|
|
|
github.com/rs/cors v1.6.0 |
|
|
|
github.com/russross/blackfriday/v2 v2.0.1 |
|
|
|
|
|
@ -32,8 +32,8 @@ github.com/klauspost/compress v1.7.1-0.20190613161414-0b31f265a57b/go.mod h1:RyI |
|
|
|
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= |
|
|
|
github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w= |
|
|
|
github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= |
|
|
|
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 h1:xKE9kZ5C8gelJC3+BNM6LJs1x21rivK7yxfTZMAuY2s= |
|
|
|
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY= |
|
|
|
github.com/mholt/certmagic v0.6.2 h1:yy9cKm3rtxdh12SW4E51lzG3Eo6N59LEOfBQ0CTnMms= |
|
|
|
github.com/mholt/certmagic v0.6.2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY= |
|
|
|
github.com/miekg/dns v1.1.3 h1:1g0r1IvskvgL8rR+AcHzUA+oFmGcQlaIm4IqakufeMM= |
|
|
|
github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= |
|
|
|
github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936 h1:kw1v0NlnN+GZcU8Ma8CLF2Zzgjfx95gs3/GN3vYAPpo= |
|
|
|
|
|
@ -19,7 +19,7 @@ import ( |
|
|
|
"strconv" |
|
|
|
|
|
|
|
"github.com/andybalholm/brotli" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2" |
|
|
|
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode" |
|
|
|
) |
|
|
|
|
|
@ -18,10 +18,10 @@ import ( |
|
|
|
"encoding/json" |
|
|
|
"fmt" |
|
|
|
|
|
|
|
"github.com/caddyserver/caddy" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" |
|
|
|
) |
|
|
|
|
|
|
|
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
|
|
|
|
|
|
@ -20,7 +20,7 @@ import ( |
|
|
|
"fmt" |
|
|
|
"strconv" |
|
|
|
|
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2" |
|
|
|
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode" |
|
|
|
) |
|
|
|
|
|
@ -15,7 +15,7 @@ |
|
|
|
package caddyzstd |
|
|
|
|
|
|
|
import ( |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2" |
|
|
|
"github.com/caddyserver/caddy/v2/modules/caddyhttp/encode" |
|
|
|
"github.com/klauspost/compress/zstd" |
|
|
|
|
|
@ -15,8 +15,8 @@ |
|
|
|
package fileserver |
|
|
|
|
|
|
|
import ( |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" |
|
|
|
) |
|
|
|
|
|
|
|
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
|
|
|
|
|
|
@ -20,7 +20,7 @@ import ( |
|
|
|
"os" |
|
|
|
"time" |
|
|
|
|
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2" |
|
|
|
"github.com/caddyserver/caddy/v2/modules/caddyhttp" |
|
|
|
) |
|
|
|
|
|
@ -18,8 +18,8 @@ import ( |
|
|
|
"net/http" |
|
|
|
"strings" |
|
|
|
|
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" |
|
|
|
) |
|
|
|
|
|
|
|
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
|
|
|
|
|
|
@ -15,8 +15,8 @@ |
|
|
|
package reverseproxy |
|
|
|
|
|
|
|
import ( |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2" |
|
|
|
) |
|
|
|
|
|
|
|
|
|
@ -15,8 +15,8 @@ |
|
|
|
package rewrite |
|
|
|
|
|
|
|
import ( |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" |
|
|
|
) |
|
|
|
|
|
|
|
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
|
|
|
|
|
|
@ -15,8 +15,8 @@ |
|
|
|
package templates |
|
|
|
|
|
|
|
import ( |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/caddyconfig/httpcaddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" |
|
|
|
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" |
|
|
|
) |
|
|
|
|
|
|
|
// UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
|
|
|
|