Mercurial > hg > nginx-ranges
diff src/core/ngx_radix_tree.c @ 112:408f195b3482 NGINX_0_3_3
nginx 0.3.3
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; bug appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 19 Oct 2005 00:00:00 +0400 |
parents | 72eb30262aac |
children | f745bf973510 |
line wrap: on
line diff
--- a/src/core/ngx_radix_tree.c +++ b/src/core/ngx_radix_tree.c @@ -205,6 +205,7 @@ ngx_radix32tree_delete(ngx_radix_tree_t for ( ;; ) { if (node->parent->right == node) { node->parent->right = NULL; + } else { node->parent->left = NULL; } @@ -214,11 +215,15 @@ ngx_radix32tree_delete(ngx_radix_tree_t node = node->parent; - if (node->right - || node->left - || node->value != NGX_RADIX_NO_VALUE - || node->parent == NULL) - { + if (node->right || node->left) { + break; + } + + if (node->value != NGX_RADIX_NO_VALUE) { + break; + } + + if (node->parent == NULL) { break; } }