Mercurial > hg > nginx
comparison src/http/modules/ngx_http_geo_module.c @ 1513:bf7814d77484 stable-0.5
r1407 merge:
use %v for ngx_variable_value_t in ngx_sprintf(),
this fixes nginx on FreeBSD/sparc64
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 22 Sep 2007 19:18:36 +0000 |
parents | 1593532dcc35 |
children | 6b81bbc36eaf |
comparison
equal
deleted
inserted
replaced
1512:b19709ee1f52 | 1513:bf7814d77484 |
---|---|
84 ngx_radix32tree_find(tree, ntohl(sin->sin_addr.s_addr)); | 84 ngx_radix32tree_find(tree, ntohl(sin->sin_addr.s_addr)); |
85 | 85 |
86 *v = *vv; | 86 *v = *vv; |
87 | 87 |
88 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 88 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
89 "http geo: %V %V", &r->connection->addr_text, v); | 89 "http geo: %V %v", &r->connection->addr_text, v); |
90 | 90 |
91 return NGX_OK; | 91 return NGX_OK; |
92 } | 92 } |
93 | 93 |
94 | 94 |
98 char *rv; | 98 char *rv; |
99 ngx_str_t *value, name; | 99 ngx_str_t *value, name; |
100 ngx_conf_t save; | 100 ngx_conf_t save; |
101 ngx_pool_t *pool; | 101 ngx_pool_t *pool; |
102 ngx_radix_tree_t *tree; | 102 ngx_radix_tree_t *tree; |
103 ngx_http_variable_t *var; | |
103 ngx_http_geo_conf_ctx_t ctx; | 104 ngx_http_geo_conf_ctx_t ctx; |
104 ngx_http_variable_t *var; | |
105 | 105 |
106 value = cf->args->elts; | 106 value = cf->args->elts; |
107 | 107 |
108 name = value[1]; | 108 name = value[1]; |
109 | 109 |
283 | 283 |
284 old = (ngx_http_variable_value_t *) | 284 old = (ngx_http_variable_value_t *) |
285 ngx_radix32tree_find(ctx->tree, cidrin.addr & cidrin.mask); | 285 ngx_radix32tree_find(ctx->tree, cidrin.addr & cidrin.mask); |
286 | 286 |
287 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | 287 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
288 "duplicate parameter \"%V\", value: \"%V\", " | 288 "duplicate parameter \"%V\", value: \"%v\", old value: \"%v\"", |
289 "old value: \"%V\"", | 289 &value[0], var, old); |
290 &value[0], var, old); | |
291 | 290 |
292 rc = ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask); | 291 rc = ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask); |
293 | 292 |
294 if (rc == NGX_ERROR) { | 293 if (rc == NGX_ERROR) { |
295 return NGX_CONF_ERROR; | 294 return NGX_CONF_ERROR; |