diff options
| author | nginx <nginx@nginx.org> | 2013-01-10 13:34:07 +0000 |
|---|---|---|
| committer | Jon Kolb <jon@b0g.us> | 2013-01-10 13:34:07 +0000 |
| commit | 61c2753477f8ea559ebf67c8bc8276a9804ecd5a (patch) | |
| tree | e3c4babf9205a52b4c9afc408fad861aa0d546c8 /src/event/ngx_event.c | |
| parent | 1c2503c4d9bc36b37e14c26ceb01558f6ca9949f (diff) | |
| download | nginx-61c2753477f8ea559ebf67c8bc8276a9804ecd5a.tar.gz | |
Changes with nginx 1.3.11 10 Jan 2013v1.3.11
*) Bugfix: a segmentation fault might occur if logging was used; the bug
had appeared in 1.3.10.
*) Bugfix: the "proxy_pass" directive did not work with IP addresses
without port specified; the bug had appeared in 1.3.10.
*) Bugfix: a segmentation fault occurred on start or during
reconfiguration if the "keepalive" directive was specified more than
once in a single upstream block.
*) Bugfix: parameter "default" of the "geo" directive did not set
default value for IPv6 addresses.
Diffstat (limited to 'src/event/ngx_event.c')
| -rw-r--r-- | src/event/ngx_event.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |