From 635dae7cadfdc67f439f7c7cb79a1c7f51285f4e Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 11 Feb 2013 14:58:25 +0000 Subject: Merge of r4999, r5003: detect duplicate "events" and "keepalive". *) Upstream keepalive: detect duplicate "keepalive" directive. A failure to detect duplicate "keepalive" directive resulted in stack exhaustion. *) Events: added check for duplicate "events" directive. --- src/event/ngx_event.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/event') diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 976bd6465..cbae0ee6a 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -892,6 +892,10 @@ ngx_events_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_conf_t pcf; ngx_event_module_t *m; + if (*(void **) conf) { + return "is duplicate"; + } + /* count the number of the event modules and set up their indices */ ngx_event_max_module = 0; -- cgit