mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

an excess was logged as 0.000 if requests were limited without delay:

Browse Source 
*) use a real excess value instead of non-updated limit_req rbtree node field,
*) move inactivity queue handling inside ngx_http_limit_req_lookup()
   since the node is not required outside the lookup function;

the bug has been introduced in r3184
This commit is contained in:
Igor Sysoev 2010-10-13 20:58:41 +00:00
parent 824856fc10
commit 622721a598
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/http/modules/ngx_http_limit_req_module.c
View File

@ -51,7 +51,7 @@ typedef struct {
static void ngx_http_limit_req_delay(ngx_http_request_t *r); static void ngx_http_limit_req_delay(ngx_http_request_t *r);
static ngx_int_t ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, static ngx_int_t ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf,
ngx_uint_t hash, u_char *data, size_t len, ngx_http_limit_req_node_t **lrp); ngx_uint_t hash, u_char *data, size_t len, ngx_uint_t *ep);
static void ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx, static void ngx_http_limit_req_expire(ngx_http_limit_req_ctx_t *ctx,
ngx_uint_t n); ngx_uint_t n);
@ -186,18 +186,7 @@ ngx_http_limit_req_handler(ngx_http_request_t *r)
ngx_http_limit_req_expire(ctx, 1); ngx_http_limit_req_expire(ctx, 1);
rc = ngx_http_limit_req_lookup(lrcf, hash, vv->data, len, &lr); rc = ngx_http_limit_req_lookup(lrcf, hash, vv->data, len, &excess);
if (lr) {
ngx_queue_remove(&lr->queue);
ngx_queue_insert_head(&ctx->sh->queue, &lr->queue);
excess = lr->excess;
} else {
excess = 0;
}
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"limit_req: %i %ui.%03ui", rc, excess / 1000, excess % 1000); "limit_req: %i %ui.%03ui", rc, excess / 1000, excess % 1000);
@ -356,7 +345,7 @@ ngx_http_limit_req_rbtree_insert_value(ngx_rbtree_node_t *temp,
static ngx_int_t static ngx_int_t
ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash, ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash,
u_char *data, size_t len, ngx_http_limit_req_node_t **lrp) u_char *data, size_t len, ngx_uint_t *ep)
{ {
ngx_int_t rc, excess; ngx_int_t rc, excess;
ngx_time_t *tp; ngx_time_t *tp;
@ -391,6 +380,8 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash,
rc = ngx_memn2cmp(data, lr->data, len, (size_t) lr->len); rc = ngx_memn2cmp(data, lr->data, len, (size_t) lr->len);
if (rc == 0) { if (rc == 0) {
ngx_queue_remove(&lr->queue);
ngx_queue_insert_head(&ctx->sh->queue, &lr->queue);
tp = ngx_timeofday(); tp = ngx_timeofday();
@ -403,16 +394,15 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash,
excess = 0; excess = 0;
} }
*ep = excess;
if ((ngx_uint_t) excess > lrcf->burst) { if ((ngx_uint_t) excess > lrcf->burst) {
*lrp = lr;
return NGX_BUSY; return NGX_BUSY;
} }
lr->excess = excess; lr->excess = excess;
lr->last = now; lr->last = now;
*lrp = lr;
if (excess) { if (excess) {
return NGX_AGAIN; return NGX_AGAIN;
} }
@ -427,7 +417,7 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash,
break; break;
} }
*lrp = NULL; *ep = 0;
return NGX_DECLINED; return NGX_DECLINED;
} }