diff options
| -rw-r--r-- | coremain/run.go | 1 | ||||
| -rw-r--r-- | plugin.cfg | 1 | ||||
| -rw-r--r-- | plugin/proxy/upstream.go | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/coremain/run.go b/coremain/run.go index a948a4c9d..98eaa5ba8 100644 --- a/coremain/run.go +++ b/coremain/run.go @@ -29,7 +29,6 @@ func init() { flag.StringVar(&caddy.PidFile, "pidfile", "", "Path to write pid file") flag.BoolVar(&version, "version", false, "Show version") flag.BoolVar(&dnsserver.Quiet, "quiet", false, "Quiet mode (no initialization output)") - flag.BoolVar(&logfile, "log", false, "Log to standard output") // noop for 1.1.4; drop in 1.2.0. caddy.RegisterCaddyfileLoader("flag", caddy.LoaderFunc(confLoader)) caddy.SetDefaultCaddyfileLoader("default", caddy.LoaderFunc(defaultLoader)) diff --git a/plugin.cfg b/plugin.cfg index c152684b7..42070373e 100644 --- a/plugin.cfg +++ b/plugin.cfg @@ -38,7 +38,6 @@ cache:cache rewrite:rewrite dnssec:dnssec autopath:autopath -reverse:deprecated template:template hosts:hosts route53:route53 diff --git a/plugin/proxy/upstream.go b/plugin/proxy/upstream.go index be3e0bdad..72d9e04a7 100644 --- a/plugin/proxy/upstream.go +++ b/plugin/proxy/upstream.go @@ -164,8 +164,6 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error { } else { u.ex = newDNSEx() } - case "https_google": - // allow the config, but make noop case "grpc": if len(encArgs) == 2 && encArgs[1] == "insecure" { u.ex = newGrpcClient(nil, u) |