IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix resolver cache rbtree comparison

Browse Source
This commit is contained in:
Igor Sysoev 2009-09-19 16:15:13 +00:00
parent 15c149e499
commit a8d3d2204f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/ngx_resolver.c
View File

@ -1599,7 +1599,6 @@ static ngx_resolver_node_t *
ngx_resolver_lookup_name(ngx_resolver_t *r, ngx_str_t *name, uint32_t hash) ngx_resolver_lookup_name(ngx_resolver_t *r, ngx_str_t *name, uint32_t hash)
{ {
ngx_int_t rc; ngx_int_t rc;
size_t len;
ngx_rbtree_node_t *node, *sentinel; ngx_rbtree_node_t *node, *sentinel;
ngx_resolver_node_t *rn; ngx_resolver_node_t *rn;
@ -1623,9 +1622,7 @@ ngx_resolver_lookup_name(ngx_resolver_t *r, ngx_str_t *name, uint32_t hash)
do { do {
rn = (ngx_resolver_node_t *) node; rn = (ngx_resolver_node_t *) node;
len = (name->len > (size_t) rn->nlen) ? rn->nlen : name->len; rc = ngx_memn2cmp(name->data, rn->name, name->len, rn->nlen);
rc = ngx_strncmp(name->data, rn->name, len);
if (rc == 0) { if (rc == 0) {
return rn; return rn;
@ -1679,7 +1676,6 @@ static void
ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp, ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel)
{ {
size_t len;
ngx_rbtree_node_t **p; ngx_rbtree_node_t **p;
ngx_resolver_node_t *rn, *rn_temp; ngx_resolver_node_t *rn, *rn_temp;
@ -1698,10 +1694,8 @@ ngx_resolver_rbtree_insert_value(ngx_rbtree_node_t *temp,
rn = (ngx_resolver_node_t *) node; rn = (ngx_resolver_node_t *) node;
rn_temp = (ngx_resolver_node_t *) temp; rn_temp = (ngx_resolver_node_t *) temp;
len = (rn->nlen > rn_temp->nlen) ? rn_temp->nlen : rn->nlen; p = (ngx_memn2cmp(rn->name, rn_temp->name, rn->nlen, rn_temp->nlen)
< 0) ? &temp->left : &temp->right;
p = (ngx_strncmp(rn->name, rn_temp->name, len) < 0)
? &temp->left : &temp->right;
} }
if (*p == sentinel) { if (*p == sentinel) {