diff options
| author | Y.Horie <u5.horie@gmail.com> | 2023-01-22 02:22:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-21 10:22:36 -0700 |
| commit | d6d7511699f6a35e3246918023af5ba3bc2cbc67 (patch) | |
| tree | e66396854c444346989408fafd73a27b6f2f38e2 /caddyconfig/caddyfile/testdata | |
| parent | 8d6870fd068aa3ea472a46f34d219f41703e2ddb (diff) | |
httpcaddyfile: Warn on importing empty file; skip dotfiles (#5320)
* httpcaddyfile: Change the parse rules when empty file or dotfile with a glob.
* Fixes #5295
* Empty file should just log a warning, and result in no tokens.
* The last segment of the path is '*', it should skip any dotfiles.
* The last segment of the path is '.*', it should read all dotfiles in a dir.
* httpcaddyfile: Regard empty files as import files which include only white space.
Diffstat (limited to 'caddyconfig/caddyfile/testdata')
4 files changed, 13 insertions, 0 deletions
diff --git a/caddyconfig/caddyfile/testdata/empty.txt b/caddyconfig/caddyfile/testdata/empty.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/caddyconfig/caddyfile/testdata/empty.txt diff --git a/caddyconfig/caddyfile/testdata/glob/.dotfile.txt b/caddyconfig/caddyfile/testdata/glob/.dotfile.txt new file mode 100644 index 0000000..faab100 --- /dev/null +++ b/caddyconfig/caddyfile/testdata/glob/.dotfile.txt @@ -0,0 +1,4 @@ +host1 { + dir1 + dir2 arg1 +} diff --git a/caddyconfig/caddyfile/testdata/glob/import_test1.txt b/caddyconfig/caddyfile/testdata/glob/import_test1.txt new file mode 100644 index 0000000..dac7b29 --- /dev/null +++ b/caddyconfig/caddyfile/testdata/glob/import_test1.txt @@ -0,0 +1,2 @@ +dir2 arg1 arg2 +dir3
\ No newline at end of file diff --git a/caddyconfig/caddyfile/testdata/only_white_space.txt b/caddyconfig/caddyfile/testdata/only_white_space.txt new file mode 100644 index 0000000..705327c --- /dev/null +++ b/caddyconfig/caddyfile/testdata/only_white_space.txt @@ -0,0 +1,7 @@ + + + + + + + |