summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2020-09-05 10:05:48 -0400
committerGlenn Strauss <gstrauss@gluelogic.com>2020-10-11 12:19:26 -0400
commitf2e4e83a8570e558389916eb2f6fcd5ad8397438 (patch)
tree5ffb65f02195176de12a86ae521a8c605557975e
parent32d4569512d1f98d35bd1ef88461c29e59ceb447 (diff)
downloadlighttpd-git-f2e4e83a8570e558389916eb2f6fcd5ad8397438.tar.gz
[mod_dirlisting] fix config parsing crash
(bug on master branch; never released) (thx avij) update doc that dir-listing.hide-dotfiles = "enable" by default since lighttpd 1.4.40 https://redmine.lighttpd.net/issues/1081
-rw-r--r--doc/config/conf.d/dirlisting.conf4
-rw-r--r--src/mod_dirlisting.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/config/conf.d/dirlisting.conf b/doc/config/conf.d/dirlisting.conf
index e2a0d15d..3382f490 100644
--- a/doc/config/conf.d/dirlisting.conf
+++ b/doc/config/conf.d/dirlisting.conf
@@ -13,9 +13,9 @@ dir-listing.activate = "disable"
##
## Hide dot files from the listing?
-## By default they are listed.
+## By default they are hidden (not listed).
##
-dir-listing.hide-dotfiles = "disable"
+dir-listing.hide-dotfiles = "enable"
##
## list of regular expressions. Files that match any of the specified
diff --git a/src/mod_dirlisting.c b/src/mod_dirlisting.c
index 9774c549..fe9fe0b0 100644
--- a/src/mod_dirlisting.c
+++ b/src/mod_dirlisting.c
@@ -208,7 +208,7 @@ SETDEFAULTS_FUNC(mod_dirlisting_set_defaults) {
,{ CONST_STR_LEN("dir-listing.exclude"),
T_CONFIG_ARRAY_VLIST,
T_CONFIG_SCOPE_CONNECTION }
- ,{ CONST_STR_LEN("dir-listing.hide-dot-files"),
+ ,{ CONST_STR_LEN("dir-listing.hide-dotfiles"),
T_CONFIG_BOOL,
T_CONFIG_SCOPE_CONNECTION }
,{ CONST_STR_LEN("dir-listing.external-css"),
@@ -285,6 +285,7 @@ SETDEFAULTS_FUNC(mod_dirlisting_set_defaults) {
case 4: /* dir-listing.external-css */
case 5: /* dir-listing.external-js */
case 6: /* dir-listing.encoding */
+ break;
case 7: /* dir-listing.show-readme */
if (!buffer_string_is_empty(cpv->v.b)) {
buffer *b;