From 09ba9e994e6391162fbfdfbd90c72270bdff3a49 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Fri, 4 Mar 2022 22:50:05 -0500 Subject: fileserver: Add `pass_thru` Caddyfile option (#4613) --- .../caddyfile_adapt/file_server_pass_thru.txt | 32 ++++++++++++++++++++++ modules/caddyhttp/fileserver/caddyfile.go | 6 ++++ 2 files changed, 38 insertions(+) create mode 100644 caddytest/integration/caddyfile_adapt/file_server_pass_thru.txt diff --git a/caddytest/integration/caddyfile_adapt/file_server_pass_thru.txt b/caddytest/integration/caddyfile_adapt/file_server_pass_thru.txt new file mode 100644 index 0000000..476b165 --- /dev/null +++ b/caddytest/integration/caddyfile_adapt/file_server_pass_thru.txt @@ -0,0 +1,32 @@ +:80 + +file_server { + pass_thru +} +---------- +{ + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":80" + ], + "routes": [ + { + "handle": [ + { + "handler": "file_server", + "hide": [ + "./Caddyfile" + ], + "pass_thru": true + } + ] + } + ] + } + } + } + } +} diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go index 886d667..2641535 100644 --- a/modules/caddyhttp/fileserver/caddyfile.go +++ b/modules/caddyhttp/fileserver/caddyfile.go @@ -120,6 +120,12 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error) falseBool := false fsrv.CanonicalURIs = &falseBool + case "pass_thru": + if h.NextArg() { + return nil, h.ArgErr() + } + fsrv.PassThru = true + default: return nil, h.Errf("unknown subdirective '%s'", h.Val()) } -- cgit v1.2.3