Klaus Demo nginx / aa96ac6
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. Maxim Dounin 10 years ago
5 changed file(s) with 6 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all
430430 &ngx_http_upstream_ignore_headers_masks },
431431
432432 { ngx_string("fastcgi_catch_stderr"),
433 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
433 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
434434 ngx_conf_set_str_array_slot,
435435 NGX_HTTP_LOC_CONF_OFFSET,
436436 offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr),
138138 NULL },
139139
140140 { ngx_string("ssi_min_file_chunk"),
141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
142142 ngx_conf_set_size_slot,
143143 NGX_HTTP_LOC_CONF_OFFSET,
144144 offsetof(ngx_http_ssi_loc_conf_t, min_file_chunk),
145145 NULL },
146146
147147 { ngx_string("ssi_value_length"),
148 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
148 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
149149 ngx_conf_set_size_slot,
150150 NGX_HTTP_LOC_CONF_OFFSET,
151151 offsetof(ngx_http_ssi_loc_conf_t, value_len),
100100 NULL },
101101
102102 { ngx_string("ssl_verify_client"),
103 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
103 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
104104 ngx_conf_set_enum_slot,
105105 NGX_HTTP_SRV_CONF_OFFSET,
106106 offsetof(ngx_http_ssl_srv_conf_t, verify),
43964396 if (ngx_strncmp(value[i].data, "max=", 4) == 0) {
43974397
43984398 max = ngx_atoi(value[i].data + 4, value[i].len - 4);
4399 if (max == NGX_ERROR) {
4399 if (max <= 0) {
44004400 goto failed;
44014401 }
44024402
5959 NULL },
6060
6161 { ngx_string("proxy_pass_error_message"),
62 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
62 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
6363 ngx_conf_set_flag_slot,
6464 NGX_MAIL_SRV_CONF_OFFSET,
6565 offsetof(ngx_mail_proxy_conf_t, pass_error_message),