diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-01-11 11:09:05 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-01-11 11:09:05 +0000 |
| commit | f2ef9db230374f5f8ff31ea3f09e02b55da892b5 (patch) | |
| tree | 39f717c03c0fbdf2738bd5bb206183f4f6ac15cb /src | |
| parent | b8ef9d92550b5077d376dbbe38f855c066530941 (diff) | |
| download | nginx-f2ef9db230374f5f8ff31ea3f09e02b55da892b5.tar.gz nginx-f2ef9db230374f5f8ff31ea3f09e02b55da892b5.zip | |
Fixed limit_req burst/nodelay inheritance (ticket #76).
The problem was introduced in r4381 (1.1.12).
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_limit_req_module.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c index 865f7666d..779b397c2 100644 --- a/src/http/modules/ngx_http_limit_req_module.c +++ b/src/http/modules/ngx_http_limit_req_module.c @@ -570,6 +570,8 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child) if (conf->shm_zone == NULL) { 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, |