Commit aa96ac67fc96899551e555cdb616137525bbbb2e - nginx

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

-1

src/http/modules/ngx_http_fastcgi_module.c less more

430	430	&ngx_http_upstream_ignore_headers_masks },
431	431
432	432	{ 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,
434	434	ngx_conf_set_str_array_slot,
435	435	NGX_HTTP_LOC_CONF_OFFSET,
436	436	offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr),

-2

src/http/modules/ngx_http_ssi_filter_module.c less more

138	138	NULL },
139	139
140	140	{ 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,
142	142	ngx_conf_set_size_slot,
143	143	NGX_HTTP_LOC_CONF_OFFSET,
144	144	offsetof(ngx_http_ssi_loc_conf_t, min_file_chunk),
145	145	NULL },
146	146
147	147	{ 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,
149	149	ngx_conf_set_size_slot,
150	150	NGX_HTTP_LOC_CONF_OFFSET,
151	151	offsetof(ngx_http_ssi_loc_conf_t, value_len),

-1

src/http/modules/ngx_http_ssl_module.c less more

100	100	NULL },
101	101
102	102	{ 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,
104	104	ngx_conf_set_enum_slot,
105	105	NGX_HTTP_SRV_CONF_OFFSET,
106	106	offsetof(ngx_http_ssl_srv_conf_t, verify),

-1

src/http/ngx_http_core_module.c less more

4396	4396	if (ngx_strncmp(value[i].data, "max=", 4) == 0) {
4397	4397
4398	4398	max = ngx_atoi(value[i].data + 4, value[i].len - 4);
4399		if (max == NGX_ERROR) {
	4399	if (max <= 0) {
4400	4400	goto failed;
4401	4401	}
4402	4402

-1

src/mail/ngx_mail_proxy_module.c less more

59	59	NULL },
60	60
61	61	{ 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,
63	63	ngx_conf_set_flag_slot,
64	64	NGX_MAIL_SRV_CONF_OFFSET,
65	65	offsetof(ngx_mail_proxy_conf_t, pass_error_message),