comparison src/http/modules/ngx_http_ssi_filter_module.c @ 4357:efd515ace6bb stable-1.0

Merge of r4270, r4274: Minor cleanup: *) Changed error message to be more appropriate in the imaginary "open_file_cache max=0" case. *) Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Dec 2011 14:31:55 +0000
parents e7798b5e990a
children ae376a94de11 2840ff6b97bd
comparison
equal deleted inserted replaced
4356:c8695c991cb8 4357:efd515ace6bb
137 NGX_HTTP_LOC_CONF_OFFSET, 137 NGX_HTTP_LOC_CONF_OFFSET,
138 offsetof(ngx_http_ssi_loc_conf_t, ignore_recycled_buffers), 138 offsetof(ngx_http_ssi_loc_conf_t, ignore_recycled_buffers),
139 NULL }, 139 NULL },
140 140
141 { ngx_string("ssi_min_file_chunk"), 141 { ngx_string("ssi_min_file_chunk"),
142 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 142 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
143 ngx_conf_set_size_slot, 143 ngx_conf_set_size_slot,
144 NGX_HTTP_LOC_CONF_OFFSET, 144 NGX_HTTP_LOC_CONF_OFFSET,
145 offsetof(ngx_http_ssi_loc_conf_t, min_file_chunk), 145 offsetof(ngx_http_ssi_loc_conf_t, min_file_chunk),
146 NULL }, 146 NULL },
147 147
148 { ngx_string("ssi_value_length"), 148 { ngx_string("ssi_value_length"),
149 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 149 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
150 ngx_conf_set_size_slot, 150 ngx_conf_set_size_slot,
151 NGX_HTTP_LOC_CONF_OFFSET, 151 NGX_HTTP_LOC_CONF_OFFSET,
152 offsetof(ngx_http_ssi_loc_conf_t, value_len), 152 offsetof(ngx_http_ssi_loc_conf_t, value_len),
153 NULL }, 153 NULL },
154 154