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

nginx 0.7.46 *) Bugfix: the previous release tarball was incorrect.

comparison

equal deleted inserted replaced

-:d46142e61c30
+:56baf312c1b5
 + len;
 node = ngx_slab_alloc_locked(shpool, n);
 if (node == NULL) {
 ngx_shmtx_unlock(&shpool->mutex);
-ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
-"could not allocate memory in zone \"%V\"",
-&lzcf->shm_zone->name);
 return NGX_HTTP_SERVICE_UNAVAILABLE;
 }
 lz = (ngx_http_limit_zone_node_t *) &node->color;
 static ngx_int_t
 ngx_http_limit_zone_init_zone(ngx_shm_zone_t *shm_zone, void *data)
 {
 ngx_http_limit_zone_ctx_t  *octx = data;
+size_t                      len;
 ngx_slab_pool_t            *shpool;
 ngx_rbtree_node_t          *sentinel;
 ngx_http_limit_zone_ctx_t  *ctx;
 ctx = shm_zone->data;
 }
 ngx_rbtree_init(ctx->rbtree, sentinel,
 ngx_http_limit_zone_rbtree_insert_value);
+len = sizeof(" in limit_zone \"\"") + shm_zone->name.len;
+shpool->log_ctx = ngx_slab_alloc(shpool, len);
+if (shpool->log_ctx == NULL) {
+return NGX_ERROR;
+}
+ngx_sprintf(shpool->log_ctx, " in limit_zone \"%V\"%Z", &shm_zone->name);
 return NGX_OK;
 }
 static void *

Mercurial > hg > nginx-vendor-current