diff options
| author |   robert <robert@openbsd.org> | 2012-02-18 11:20:21 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-02-18 11:20:21 +0000 |
| commit | 5fae4203d5006620c06fc511154d915fa178bddc (patch) | |
| tree | 99af4f7ac830c3cd0f303afe87f92dd20f44e8b5 /usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c | |
| parent | Extend after recent msdos support. (diff) | |
| download | wireguard-openbsd-5fae4203d5006620c06fc511154d915fa178bddc.tar.xz wireguard-openbsd-5fae4203d5006620c06fc511154d915fa178bddc.zip | |
update to 1.0.12
Diffstat (limited to 'usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c')
| -rw-r--r-- | usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c index 718fae8e2e2..1d156157f69 100644 --- a/usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c +++ b/usr.sbin/nginx/src/http/modules/ngx_http_limit_req_module.c @@ -1,6 +1,7 @@ /* * Copyright (C) Igor Sysoev + * Copyright (C) Nginx, Inc. */ @@ -569,7 +570,9 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child) ngx_http_limit_req_conf_t *conf = child; if (conf->shm_zone == NULL) { - *conf = *prev; + conf->shm_zone = prev->shm_zone; + conf->burst = prev->burst; + conf->nodelay = prev->nodelay; } ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, |