Mercurial > hg > nginx
comparison src/http/modules/ngx_http_geo_module.c @ 3238:415400fa0f10 stable-0.7
merge r2920, r2934, r3116, r3119:
style fixes
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 16:06:11 +0000 |
parents | a472d954c534 |
children | f678ea405737 |
comparison
equal
deleted
inserted
replaced
3237:2efa8d2fcde1 | 3238:415400fa0f10 |
---|---|
862 return NGX_CONF_ERROR; | 862 return NGX_CONF_ERROR; |
863 } | 863 } |
864 | 864 |
865 /* rc == NGX_BUSY */ | 865 /* rc == NGX_BUSY */ |
866 | 866 |
867 old = (ngx_http_variable_value_t *) | 867 old = (ngx_http_variable_value_t *) |
868 ngx_radix32tree_find(ctx->tree, cidr.u.in.addr & cidr.u.in.mask); | 868 ngx_radix32tree_find(ctx->tree, cidr.u.in.addr & cidr.u.in.mask); |
869 | 869 |
870 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | 870 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
871 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"", | 871 "duplicate network \"%V\", value: \"%v\", old value: \"%v\"", |
872 net, val, old); | 872 net, val, old); |