summaryrefslogtreecommitdiffhomepage
path: root/src/http
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-08-06 17:31:32 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-08-06 17:31:32 +0000
commit6145efaef48172485df62934b3e0f08822ce2e18 (patch)
tree59eee785bae9f96efba74b9219dbabce2e774b71 /src/http
parent5ac59c235d71c506619e10a77827efb7ca87e157 (diff)
downloadnginx-6145efaef48172485df62934b3e0f08822ce2e18.tar.gz
nginx-6145efaef48172485df62934b3e0f08822ce2e18.tar.bz2
Merge of r4769: better diagnostics for directives in wrong context.
Diffstat (limited to 'src/http')
-rw-r--r--src/http/ngx_http_core_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6d7dc0abe..be1f1e3b5 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -222,7 +222,7 @@ static ngx_command_t ngx_http_core_commands[] = {
NULL },
{ ngx_string("server"),
- NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_MULTI|NGX_CONF_NOARGS,
+ NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
ngx_http_core_server,
0,
0,