Changeset 1732
- Timestamp:
- 04/09/2007 08:22:41 PM (1 year ago)
- Files:
-
- branches/lighttpd-1.4.x/NEWS (modified) (1 diff)
- branches/lighttpd-1.4.x/src/mod_dirlisting.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/lighttpd-1.4.x/NEWS
r1731 r1732 30 30 accesslog for files (fixes #1064) 31 31 * fixed various crashes at startup on broken accesslog.format strings (#1000) 32 * fixed handling of %% in accesslog.format 32 * fixed handling of %% in accesslog.format 33 * fixed conditional dir-listing.exclude (#930) 33 34 34 35 branches/lighttpd-1.4.x/src/mod_dirlisting.c
r1371 r1732 231 231 /* handle plugin config and check values */ 232 232 233 #define CONFIG_EXCLUDE "dir-listing.exclude" 234 #define CONFIG_ACTIVATE "dir-listing.activate" 235 #define CONFIG_HIDE_DOTFILES "dir-listing.hide-dotfiles" 236 #define CONFIG_EXTERNAL_CSS "dir-listing.external-css" 237 #define CONFIG_ENCODING "dir-listing.encoding" 238 #define CONFIG_SHOW_README "dir-listing.show-readme" 239 #define CONFIG_HIDE_README_FILE "dir-listing.hide-readme-file" 240 #define CONFIG_SHOW_HEADER "dir-listing.show-header" 241 #define CONFIG_HIDE_HEADER_FILE "dir-listing.hide-header-file" 242 #define CONFIG_DIR_LISTING "server.dir-listing" 243 233 244 SETDEFAULTS_FUNC(mod_dirlisting_set_defaults) { 234 245 plugin_data *p = p_d; … … 236 247 237 248 config_values_t cv[] = { 238 { "dir-listing.exclude",NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 0 */239 { "dir-listing.activate", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */240 { "dir-listing.hide-dotfiles", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 2 */241 { "dir-listing.external-css", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 3 */242 { "dir-listing.encoding", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 4 */243 { "dir-listing.show-readme", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 5 */244 { "dir-listing.hide-readme-file", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 6 */245 { "dir-listing.show-header", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 7 */246 { "dir-listing.hide-header-file", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 8 */247 { "server.dir-listing",NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 9 */249 { CONFIG_EXCLUDE, NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ 250 { CONFIG_ACTIVATE, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ 251 { CONFIG_HIDE_DOTFILES, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 2 */ 252 { CONFIG_EXTERNAL_CSS, NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 3 */ 253 { CONFIG_ENCODING, NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 4 */ 254 { CONFIG_SHOW_README, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 5 */ 255 { CONFIG_HIDE_README_FILE, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 6 */ 256 { CONFIG_SHOW_HEADER, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 7 */ 257 { CONFIG_HIDE_HEADER_FILE, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 8 */ 258 { CONFIG_DIR_LISTING, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 9 */ 248 259 249 260 { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } … … 287 298 } 288 299 289 parse_config_entry(srv, s, ca, "dir-listing.exclude");300 parse_config_entry(srv, s, ca, CONFIG_EXCLUDE); 290 301 } 291 302 … … 321 332 data_unset *du = dc->value->data[j]; 322 333 323 if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.activate")) ||324 buffer_is_equal_string(du->key, CONST_STR_LEN( "server.dir-listing"))) {334 if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_ACTIVATE)) || 335 buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_DIR_LISTING))) { 325 336 PATCH(dir_listing); 326 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.hide-dotfiles"))) {337 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_DOTFILES))) { 327 338 PATCH(hide_dot_files); 328 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.external-css"))) {339 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_EXTERNAL_CSS))) { 329 340 PATCH(external_css); 330 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.encoding"))) {341 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_ENCODING))) { 331 342 PATCH(encoding); 332 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.show-readme"))) {343 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_SHOW_README))) { 333 344 PATCH(show_readme); 334 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.hide-readme-file"))) {345 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_README_FILE))) { 335 346 PATCH(hide_readme_file); 336 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.show-header"))) {347 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_SHOW_HEADER))) { 337 348 PATCH(show_header); 338 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.hide-header-file"))) {349 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_HIDE_HEADER_FILE))) { 339 350 PATCH(hide_header_file); 340 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN( "dir-listing.excludes"))) {351 } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_EXCLUDE))) { 341 352 PATCH(excludes); 342 353 }
