comparison src/http/modules/ngx_http_geo_module.c @ 324:7cf404023f50 NGINX_0_5_32

nginx 0.5.32 *) Change: now nginx tries to set the "worker_priority", "worker_rlimit_nofile", "worker_rlimit_core", and "worker_rlimit_sigpending" without super-user privileges. *) Change: now nginx escapes space and "%" in request to a mail proxy authentication server. *) Change: now nginx escapes "%" in $memcached_key variable. *) Change: the special make target "upgrade1" was defined for online upgrade of 0.1.x versions. *) Feature: the "add_header Last-Modified ..." directive changes the "Last-Modified" response header line. *) Feature: the mail proxy supports AUTHENTICATE in IMAP mode. Thanks to Maxim Dounin. *) Feature: the mail proxy supports STARTTLS in SMTP mode. Thanks to Maxim Dounin. *) Bugfix: nginx did not close directory file on HEAD request if autoindex was used. Thanks to Arkadiusz Patyk. *) Bugfix: the "proxy_hide_header" and "fastcgi_hide_header" directives did not hide response header lines whose name was longer than 32 characters. Thanks to Manlio Perillo. *) Bugfix: active connection counter always increased if mail proxy was used. *) Bugfix: if backend returned response header only using non-buffered proxy, then nginx closed backend connection on timeout. *) Bugfix: nginx did not support several "Connection" request header lines. *) Bugfix: a charset set by the "charset" directive was not appended to the "Content-Type" header set by $r->send_http_header(). *) Bugfix: a segmentation fault might occur in worker process if /dev/poll method was used. *) Bugfix: nginx did not work on FreeBSD/sparc64. *) Bugfix: a segmentation fault occurred in worker process if invalid address was set in the "auth_http" directive. *) Bugfix: now nginx uses default listen backlog value 511 on all platforms except FreeBSD. Thanks to Jiang Hong. *) Bugfix: now Solaris sendfilev() is not used to transfer the client request body to FastCGI-server via the unix domain socket. *) Bugfix: if the same host without specified port was used as backend for HTTP and HTTPS, then nginx used only one port - 80 or 443. *) Bugfix: the "proxy_ignore_client_abort" and "fastcgi_ignore_client_abort" directives did not work; bug appeared in 0.5.13.
author Igor Sysoev <http://sysoev.ru>
date Mon, 24 Sep 2007 00:00:00 +0400
parents 54aabf2b0bc6
children 26ff8d6b618d
comparison
equal deleted inserted replaced
323:85aeb2da6e4c 324:7cf404023f50
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
210 if (ngx_strcmp(value[0].data, "default") == 0) { 210 if (ngx_strcmp(value[0].data, "default") == 0) {
211 cidrin.addr = 0; 211 cidrin.addr = 0;
212 cidrin.mask = 0; 212 cidrin.mask = 0;
213 213
214 } else { 214 } else {
215 if (ngx_ptocidr(&value[0], &cidrin) == NGX_ERROR) { 215 rc = ngx_ptocidr(&value[0], &cidrin);
216
217 if (rc == NGX_ERROR) {
216 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 218 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
217 "invalid parameter \"%V\"", &value[0]); 219 "invalid parameter \"%V\"", &value[0]);
218 return NGX_CONF_ERROR; 220 return NGX_CONF_ERROR;
221 }
222
223 if (rc == NGX_DONE) {
224 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
225 "low address bits of %V are meaningless",
226 &value[0]);
219 } 227 }
220 228
221 cidrin.addr = ntohl(cidrin.addr); 229 cidrin.addr = ntohl(cidrin.addr);
222 cidrin.mask = ntohl(cidrin.mask); 230 cidrin.mask = ntohl(cidrin.mask);
223 } 231 }
275 283
276 old = (ngx_http_variable_value_t *) 284 old = (ngx_http_variable_value_t *)
277 ngx_radix32tree_find(ctx->tree, cidrin.addr & cidrin.mask); 285 ngx_radix32tree_find(ctx->tree, cidrin.addr & cidrin.mask);
278 286
279 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, 287 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
280 "duplicate parameter \"%V\", value: \"%V\", " 288 "duplicate parameter \"%V\", value: \"%v\", old value: \"%v\"",
281 "old value: \"%V\"", 289 &value[0], var, old);
282 &value[0], var, old);
283 290
284 rc = ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask); 291 rc = ngx_radix32tree_delete(ctx->tree, cidrin.addr, cidrin.mask);
285 292
286 if (rc == NGX_ERROR) { 293 if (rc == NGX_ERROR) {
287 return NGX_CONF_ERROR; 294 return NGX_CONF_ERROR;