From f975df2451ff989ec252731b25a45ac02985372a Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 5 Oct 2005 12:54:56 +0000 Subject: Changes with nginx 0.2.6 05 Oct 2005 *) Change: while using load-balancing the time before the failed backend retry was decreased from 60 to 10 seconds. *) Change: the "proxy_pass_unparsed_uri" was canceled, the original URI now passed, if the URI part is omitted in "proxy_pass" directive. *) Feature: the "error_page" directive supports redirects and allows more flexible to change an error code. *) Change: the charset in the "Content-Type" header line now is ignored in proxied subrequests. *) Bugfix: if the URI was changed in the "if" block and request did not found new configuration, then the ngx_http_rewrite_module rules ran again. *) Bugfix: if the "set" directive set the ngx_http_geo_module variable in some configuration part, the this variable was not available in other configuration parts and the "using uninitialized variable" error was occurred; bug appeared in 0.2.2. --- src/imap/ngx_imap_auth_http_module.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/imap') diff --git a/src/imap/ngx_imap_auth_http_module.c b/src/imap/ngx_imap_auth_http_module.c index 571cd270d..3cafa6f40 100644 --- a/src/imap/ngx_imap_auth_http_module.c +++ b/src/imap/ngx_imap_auth_http_module.c @@ -1068,7 +1068,6 @@ ngx_imap_auth_http(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_imap_auth_http_conf_t *ahcf = conf; - ngx_uint_t i; ngx_str_t *value, *url; ngx_inet_upstream_t inet_upstream; #if (NGX_HAVE_UNIX_DOMAIN) @@ -1094,8 +1093,6 @@ ngx_imap_auth_http(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } - ahcf->peers->peer[0].uri_separator = ":"; - ahcf->host_header.len = sizeof("localhost") - 1; ahcf->host_header.data = (u_char *) "localhost"; ahcf->uri = unix_upstream.uri; @@ -1121,13 +1118,14 @@ ngx_imap_auth_http(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } - for (i = 0; i < ahcf->peers->number; i++) { - ahcf->peers->peer[i].uri_separator = ""; - } - ahcf->host_header = inet_upstream.host_header; ahcf->uri = inet_upstream.uri; } + if (ahcf->uri.len) { + ahcf->uri.len = sizeof("/") - 1; + ahcf->uri.data = (u_char *) "/"; + } + return NGX_CONF_OK; } -- cgit v1.2.1