Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 4803:92a620dd8036 stable-1.2
Merge of r4769: better diagnostics for directives in wrong context.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 17:31:32 +0000 |
parents | 7d0c7bf2874d |
children | 43b7b9572fe1 |
comparison
equal
deleted
inserted
replaced
4802:6fc86fe0b586 | 4803:92a620dd8036 |
---|---|
220 NGX_HTTP_MAIN_CONF_OFFSET, | 220 NGX_HTTP_MAIN_CONF_OFFSET, |
221 offsetof(ngx_http_core_main_conf_t, server_names_hash_bucket_size), | 221 offsetof(ngx_http_core_main_conf_t, server_names_hash_bucket_size), |
222 NULL }, | 222 NULL }, |
223 | 223 |
224 { ngx_string("server"), | 224 { ngx_string("server"), |
225 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_MULTI|NGX_CONF_NOARGS, | 225 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, |
226 ngx_http_core_server, | 226 ngx_http_core_server, |
227 0, | 227 0, |
228 0, | 228 0, |
229 NULL }, | 229 NULL }, |
230 | 230 |