diff options
| author | Sergey Budnevitch <sb@waeme.net> | 2011-11-14 09:12:15 +0000 |
|---|---|---|
| committer | Sergey Budnevitch <sb@waeme.net> | 2011-11-14 09:12:15 +0000 |
| commit | 66a60a62cc002db31f8dd9c5112a92d55bf13fbd (patch) | |
| tree | d360ad81ccf2c763894e12077b59a51736edd1b6 /src | |
| parent | 1dbd331849d53e7e9d3c6f76e57c11c3156a6840 (diff) | |
| download | nginx-66a60a62cc002db31f8dd9c5112a92d55bf13fbd.tar.gz nginx-66a60a62cc002db31f8dd9c5112a92d55bf13fbd.zip | |
Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_fastcgi_module.c | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 2 | ||||
| -rw-r--r-- | src/mail/ngx_mail_proxy_module.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index 6f639acc2..8176be632 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -436,7 +436,7 @@ static ngx_command_t ngx_http_fastcgi_commands[] = { &ngx_http_upstream_ignore_headers_masks }, { ngx_string("fastcgi_catch_stderr"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_str_array_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_fastcgi_loc_conf_t, catch_stderr), diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index 75a7156ef..0b8bc9bf8 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -139,14 +139,14 @@ static ngx_command_t ngx_http_ssi_filter_commands[] = { NULL }, { ngx_string("ssi_min_file_chunk"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_size_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_ssi_loc_conf_t, min_file_chunk), NULL }, { ngx_string("ssi_value_length"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_size_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_ssi_loc_conf_t, value_len), diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index f1f6a4ae4..0ac744ca1 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -101,7 +101,7 @@ static ngx_command_t ngx_http_ssl_commands[] = { NULL }, { ngx_string("ssl_verify_client"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, ngx_conf_set_enum_slot, NGX_HTTP_SRV_CONF_OFFSET, offsetof(ngx_http_ssl_srv_conf_t, verify), diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c index a7c4b7e48..298e8d96a 100644 --- a/src/mail/ngx_mail_proxy_module.c +++ b/src/mail/ngx_mail_proxy_module.c @@ -60,7 +60,7 @@ static ngx_command_t ngx_mail_proxy_commands[] = { NULL }, { ngx_string("proxy_pass_error_message"), - NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, + NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, ngx_conf_set_flag_slot, NGX_MAIL_SRV_CONF_OFFSET, offsetof(ngx_mail_proxy_conf_t, pass_error_message), |