From 09c684b2d53b46b6ffb706c686ca4dbed62cf6da Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 9 Nov 2005 17:25:55 +0000 Subject: nginx-0.3.8-RELEASE import *) Security: nginx now checks URI got from a backend in "X-Accel-Redirect" header line or in SSI file for the "/../" paths and zeroes. *) Change: nginx now does not treat the empty user name in the "Authorization" header line as valid one. *) Feature: the "ssl_session_timeout" directives of the ngx_http_ssl_module and ngx_imap_ssl_module. *) Feature: the "auth_http_header" directive of the ngx_imap_auth_http_module. *) Feature: the "add_header" directive. *) Feature: the ngx_http_realip_module. *) Feature: the new variables to use in the "log_format" directive: $bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri, $request_time, $request_length, $upstream_status, $upstream_response_time, $gzip_ratio, $uid_got, $uid_set, $connection, $pipe, and $msec. The parameters in the "%name" form will be canceled soon. *) Change: now the false variable values in the "if" directive are the empty string "" and string starting with "0". *) Bugfix: while using proxied or FastCGI-server nginx may leave connections and temporary files with client requests in open state. *) Bugfix: the worker processes did not flush the buffered logs on graceful exit. *) Bugfix: if the request URI was changes by the "rewrite" directive and the request was proxied in location given by regular expression, then the incorrect request was transferred to backend; the bug had appeared in 0.2.6. *) Bugfix: the "expires" directive did not remove the previous "Expires" header. *) Bugfix: nginx may stop to accept requests if the "rtsig" method and several worker processes were used. *) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in SSI commands. *) Bugfix: if the response was ended just after the SSI command and gzipping was used, then the response did not transferred complete or did not transferred at all. --- src/http/modules/ngx_http_geo_module.c | 57 +++++++++++++++------------------- 1 file changed, 25 insertions(+), 32 deletions(-) (limited to 'src/http/modules/ngx_http_geo_module.c') diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c index 6d94a069e..a3638e4bf 100644 --- a/src/http/modules/ngx_http_geo_module.c +++ b/src/http/modules/ngx_http_geo_module.c @@ -65,31 +65,34 @@ ngx_module_t ngx_http_geo_module = { static ngx_http_variable_value_t ngx_http_geo_null_value = - { 0, ngx_string("0") }; + ngx_http_variable(""); /* AF_INET only */ -static ngx_http_variable_value_t * -ngx_http_geo_variable(ngx_http_request_t *r, uintptr_t data) +static ngx_int_t +ngx_http_geo_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, + uintptr_t data) { ngx_radix_tree_t *tree = (ngx_radix_tree_t *) data; struct sockaddr_in *sin; - ngx_http_variable_value_t *var; + ngx_http_variable_value_t *vv; sin = (struct sockaddr_in *) r->connection->sockaddr; ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http geo started"); - var = (ngx_http_variable_value_t *) + vv = (ngx_http_variable_value_t *) ngx_radix32tree_find(tree, ntohl(sin->sin_addr.s_addr)); + *v = *vv; + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http geo: %V %V", &r->connection->addr_text, &var->text); + "http geo: %V %V", &r->connection->addr_text, v); - return var; + return NGX_OK; } @@ -182,7 +185,7 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) static char * ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) { - ngx_int_t rc, n; + ngx_int_t rc; ngx_str_t *value, file; ngx_uint_t i; ngx_inet_cidr_t cidrin; @@ -226,30 +229,18 @@ ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) cidrin.mask = ntohl(cidrin.mask); } - n = ngx_atoi(value[1].data, value[1].len); - var = NULL; v = geo->values.elts; - if (n == NGX_ERROR) { - for (i = 0; i < geo->values.nelts; i++) { - if (v[i]->text.len != value[1].len) { - continue; - } - - if (ngx_strncmp(value[1].data, v[i]->text.data, value[1].len) == 0) - { - var = v[i]; - break; - } + for (i = 0; i < geo->values.nelts; i++) { + if ((size_t) v[i]->len != value[1].len) { + continue; } - } else { - for (i = 0; i < geo->values.nelts; i++) { - if (v[i]->value == (ngx_uint_t) n) { - var = v[i]; - break; - } + if (ngx_strncmp(value[1].data, v[i]->data, value[1].len) == 0) + { + var = v[i]; + break; } } @@ -259,13 +250,15 @@ ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) return NGX_CONF_ERROR; } - var->text.len = value[1].len; - var->text.data = ngx_pstrdup(geo->pool, &value[1]); - if (var->text.data == NULL) { + var->len = value[1].len; + var->data = ngx_pstrdup(geo->pool, &value[1]); + if (var->data == NULL) { return NGX_CONF_ERROR; } - var->value = (n == NGX_ERROR) ? 0 : n; + var->valid = 1; + var->no_cachable = 0; + var->not_found = 0; v = ngx_array_push(&geo->values); if (v == NULL) { @@ -294,7 +287,7 @@ ngx_http_geo(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "duplicate parameter \"%V\", value: \"%V\", " "old value: \"%V\"", - &value[0], &var->text, &old->text); + &value[0], var, old); rc = ngx_radix32tree_delete(geo->tree, cidrin.addr, cidrin.mask); -- cgit