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

fix key length and alignment

Browse Source
This commit is contained in:
Igor Sysoev 2007-01-07 09:18:26 +00:00
parent 138e384c44
commit ba658fc603
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/http/modules/ngx_http_limit_zone_module.c
View File

@ -10,7 +10,8 @@
typedef struct { typedef struct {
u_short len; u_char color;
u_char len;
u_short conn; u_short conn;
u_char data[1]; u_char data[1];
} ngx_http_limit_zone_node_t; } ngx_http_limit_zone_node_t;
@ -148,12 +149,12 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
} }
if (hash == node->key ){ if (hash == node->key ){
lz = (ngx_http_limit_zone_node_t *) &node->data; lz = (ngx_http_limit_zone_node_t *) &node->color;
if (len == (size_t) lz->len if (len == (size_t) lz->len
&& ngx_strncmp(lz->data, vv->data, len) == 0) && ngx_strncmp(lz->data, vv->data, len) == 0)
{ {
if (lz->conn < (u_short) lzcf->conn) { if ((ngx_uint_t) lz->conn < lzcf->conn) {
lz->conn++; lz->conn++;
goto done; goto done;
} }
@ -165,7 +166,7 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
} }
} }
n = offsetof(ngx_rbtree_node_t, data) n = offsetof(ngx_rbtree_node_t, color)
+ offsetof(ngx_http_limit_zone_node_t, data) + offsetof(ngx_http_limit_zone_node_t, data)
+ len; + len;
@ -175,10 +176,10 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
return NGX_HTTP_SERVICE_UNAVAILABLE; return NGX_HTTP_SERVICE_UNAVAILABLE;
} }
lz = (ngx_http_limit_zone_node_t *) &node->data; lz = (ngx_http_limit_zone_node_t *) &node->color;
node->key = hash; node->key = hash;
lz->len = (u_short) len; lz->len = (u_char) len;
lz->conn = 1; lz->conn = 1;
ngx_memcpy(lz->data, vv->data, len); ngx_memcpy(lz->data, vv->data, len);
@ -214,7 +215,7 @@ ngx_http_limit_zone_cleanup(void *data)
rbtree = lzcln->shm_zone->data; rbtree = lzcln->shm_zone->data;
shpool = (ngx_slab_pool_t *) lzcln->shm_zone->shm.addr; shpool = (ngx_slab_pool_t *) lzcln->shm_zone->shm.addr;
node = lzcln->node; node = lzcln->node;
lz = (ngx_http_limit_zone_node_t *) &node->data; lz = (ngx_http_limit_zone_node_t *) &node->color;
ngx_shmtx_lock(&shpool->mutex); ngx_shmtx_lock(&shpool->mutex);