nginx-vendor-current: src/http/modules/ngx_http_limit_req

comparison src/http/modules/ngx_http_limit_req_module.c @ 602:c5122335e41d NGINX_0_8_53

nginx 0.8.53 *) Feature: now the "error_page" directive allows to change a status code in a redirect. *) Feature: the "gzip_disable" directive supports special "degradation" mask. *) Bugfix: a socket leak might occurred if file AIO was used. Thanks to Maxim Dounin. *) Bugfix: if the first server had no "listen" directive and there was no explicit default server, then a next server with a "listen" directive became the default server; the bug had appeared in 0.8.21.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 18 Oct 2010 00:00:00 +0400
parents	ff463db0be31
children	9d21dad0b5a1

comparison

equal deleted inserted replaced

-:b2afd36d87f4
+:c5122335e41d
 } ngx_http_limit_req_conf_t;
 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,
-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,
 ngx_uint_t n);
 static void *ngx_http_limit_req_create_conf(ngx_conf_t *cf);
 static char *ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent,
 ngx_shmtx_lock(&ctx->shpool->mutex);
 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,
 "limit_req: %i %ui.%03ui", rc, excess / 1000, excess % 1000);
+if (rc == NGX_DECLINED) {
+n = offsetof(ngx_rbtree_node_t, color)
++ offsetof(ngx_http_limit_req_node_t, data)
++ len;
+node = ngx_slab_alloc_locked(ctx->shpool, n);
+if (node == NULL) {
+ngx_http_limit_req_expire(ctx, 0);
+node = ngx_slab_alloc_locked(ctx->shpool, n);
+if (node == NULL) {
+ngx_shmtx_unlock(&ctx->shpool->mutex);
+return NGX_HTTP_SERVICE_UNAVAILABLE;
+}
+}
+lr = (ngx_http_limit_req_node_t *) &node->color;
+node->key = hash;
+lr->len = (u_char) len;
+tp = ngx_timeofday();
+lr->last = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
+lr->excess = 0;
+ngx_memcpy(lr->data, vv->data, len);
+ngx_rbtree_insert(&ctx->sh->rbtree, node);
+ngx_queue_insert_head(&ctx->sh->queue, &lr->queue);
+ngx_shmtx_unlock(&ctx->shpool->mutex);
+return NGX_DECLINED;
+}
+ngx_shmtx_unlock(&ctx->shpool->mutex);
+if (rc == NGX_OK) {
+return NGX_DECLINED;
+}
 if (rc == NGX_BUSY) {
-ngx_shmtx_unlock(&ctx->shpool->mutex);
 ngx_log_error(lrcf->limit_log_level, r->connection->log, 0,
 "limiting requests, excess: %ui.%03ui by zone \"%V\"",
 excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name);
 return NGX_HTTP_SERVICE_UNAVAILABLE;
 }
-if (rc == NGX_AGAIN) {
+/* rc == NGX_AGAIN */
-ngx_shmtx_unlock(&ctx->shpool->mutex);
+if (lrcf->nodelay) {
-if (lrcf->nodelay) {
+return NGX_DECLINED;
-return NGX_DECLINED;
+}
-}
+ngx_log_error(lrcf->delay_log_level, r->connection->log, 0,
-ngx_log_error(lrcf->delay_log_level, r->connection->log, 0,
+"delaying request, excess: %ui.%03ui, by zone \"%V\"",
-"delaying request, excess: %ui.%03ui, by zone \"%V\"",
+excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name);
-excess / 1000, excess % 1000, &lrcf->shm_zone->shm.name);
+if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
-if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) {
+return NGX_HTTP_INTERNAL_SERVER_ERROR;
-return NGX_HTTP_INTERNAL_SERVER_ERROR;
+}
-}
+r->read_event_handler = ngx_http_test_reading;
-r->read_event_handler = ngx_http_test_reading;
+r->write_event_handler = ngx_http_limit_req_delay;
-r->write_event_handler = ngx_http_limit_req_delay;
+ngx_add_timer(r->connection->write,
-ngx_add_timer(r->connection->write,
+(ngx_msec_t) excess * 1000 / ctx->rate);
-(ngx_msec_t) excess * 1000 / ctx->rate);
+return NGX_AGAIN;
-return NGX_AGAIN;
-}
-if (rc == NGX_OK) {
-goto done;
-}
-/* rc == NGX_DECLINED */
-n = offsetof(ngx_rbtree_node_t, color)
-+ offsetof(ngx_http_limit_req_node_t, data)
-+ len;
-node = ngx_slab_alloc_locked(ctx->shpool, n);
-if (node == NULL) {
-ngx_http_limit_req_expire(ctx, 0);
-node = ngx_slab_alloc_locked(ctx->shpool, n);
-if (node == NULL) {
-ngx_shmtx_unlock(&ctx->shpool->mutex);
-return NGX_HTTP_SERVICE_UNAVAILABLE;
-}
-}
-lr = (ngx_http_limit_req_node_t *) &node->color;
-node->key = hash;
-lr->len = (u_char) len;
-tp = ngx_timeofday();
-lr->last = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
-lr->excess = 0;
-ngx_memcpy(lr->data, vv->data, len);
-ngx_rbtree_insert(&ctx->sh->rbtree, node);
-ngx_queue_insert_head(&ctx->sh->queue, &lr->queue);
-done:
-ngx_shmtx_unlock(&ctx->shpool->mutex);
-return NGX_DECLINED;
 }
 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, 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_time_t                 *tp;
 ngx_msec_t                  now;
 ngx_msec_int_t              ms;
 lr = (ngx_http_limit_req_node_t *) &node->color;
 rc = ngx_memn2cmp(data, lr->data, len, (size_t) lr->len);
 if (rc == 0) {
+ngx_queue_remove(&lr->queue);
+ngx_queue_insert_head(&ctx->sh->queue, &lr->queue);
 tp = ngx_timeofday();
 now = (ngx_msec_t) (tp->sec * 1000 + tp->msec);
 ms = (ngx_msec_int_t) (now - lr->last);
 if (excess < 0) {
 excess = 0;
 }
+*ep = excess;
 if ((ngx_uint_t) excess > lrcf->burst) {
-*lrp = lr;
 return NGX_BUSY;
 }
 lr->excess = excess;
 lr->last = now;
-*lrp = lr;
 if (excess) {
 return NGX_AGAIN;
 }
 } while (node != sentinel && hash == node->key);
 break;
 }
-*lrp = NULL;
+*ep = 0;
 return NGX_DECLINED;
 }

Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_limit_req_module.c @ 602:c5122335e41d NGINX_0_8_53