diff --git a/README.rst b/README.rst index b81e3b2..b4b98f7 100644 --- a/README.rst +++ b/README.rst @@ -130,23 +130,6 @@ fancyindex_readme_mode will instruct the client to perform an additional request in order to fetch the contents of the frame. -fancyindex_include_mode -:Syntax: *fancyindex_include_mode* *static* | *cached* -:Default: *fancyindex_include_mode static* -:Context: http, server, location -:Description: - Controls how to include the header and footer specified by - `fancyindex_header`_ and `fancyindex_footer`_, Available options are: - - static - Read file contents on each request. This is the less efficient method, - but generated content will always follow on-disk changes of head and - footer templates. - cached - Header and footer contents will be read the first time they are - needed, and kept in memory for thei use in subsequent requests. If the - modification time of files changes, they will be re-read as needed. - .. _nginx: http://nginx.net diff --git a/ngx_http_fancyindex_module.c b/ngx_http_fancyindex_module.c index abacfad..6a01501 100644 --- a/ngx_http_fancyindex_module.c +++ b/ngx_http_fancyindex_module.c @@ -80,13 +80,6 @@ static const ngx_conf_bitmask_t ngx_http_fancyindex_readme_flags[] = { -static const ngx_conf_enum_t ngx_http_fancyindex_include_modes[] = { - { ngx_string("static"), NGX_HTTP_FANCYINDEX_INCLUDE_STATIC }, - { ngx_string("cached"), NGX_HTTP_FANCYINDEX_INCLUDE_CACHED }, - { ngx_null_string, 0 }, -}; - - static ngx_command_t ngx_http_fancyindex_commands[] = { { ngx_string("fancyindex"), @@ -138,13 +131,6 @@ static ngx_command_t ngx_http_fancyindex_commands[] = { offsetof(ngx_http_fancyindex_loc_conf_t, readme_flags), &ngx_http_fancyindex_readme_flags }, - { ngx_string("fancyindex_include_mode"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, - ngx_conf_set_enum_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_fancyindex_loc_conf_t, include_mode), - &ngx_http_fancyindex_include_modes }, - ngx_null_command }; @@ -841,7 +827,6 @@ ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf) conf->enable = NGX_CONF_UNSET; conf->localtime = NGX_CONF_UNSET; conf->exact_size = NGX_CONF_UNSET; - conf->include_mode = NGX_CONF_UNSET; return conf; } @@ -856,8 +841,6 @@ ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->enable, prev->enable, 0); ngx_conf_merge_value(conf->localtime, prev->localtime, 0); ngx_conf_merge_value(conf->exact_size, prev->exact_size, 1); - ngx_conf_merge_uint_value(conf->include_mode, prev->include_mode, - NGX_HTTP_FANCYINDEX_INCLUDE_STATIC); ngx_conf_merge_str_value(conf->header, prev->header, ""); ngx_conf_merge_str_value(conf->footer, prev->footer, ""); diff --git a/ngx_http_fancyindex_module.h b/ngx_http_fancyindex_module.h index 07c8d76..04fe02f 100644 --- a/ngx_http_fancyindex_module.h +++ b/ngx_http_fancyindex_module.h @@ -46,7 +46,6 @@ typedef struct { ngx_str_t readme; /**< File name for readme, or empty if none. */ ngx_uint_t readme_flags; /**< Options for readme file inclusion. */ - ngx_uint_t include_mode; /**< Controls how to include footer/header. */ } ngx_http_fancyindex_loc_conf_t;