From 0e5dc5cff692f532f0ccb2655ab196995f4233e0 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 15 Nov 2005 13:30:52 +0000 Subject: nginx-0.3.10-RELEASE import *) Change: the "valid_referers" directive and the "$invalid_referer" variable were moved to the new ngx_http_referer_module from the ngx_http_rewrite_module. *) Change: the "$apache_bytes_sent" variable name was changed to "$body_bytes_sent". *) Feature: the "$sent_http_..." variables. *) Feature: the "if" directive supports the "=" and "!=" operations. *) Feature: the "proxy_pass" directive supports the HTTPS protocol. *) Feature: the "proxy_set_body" directive. *) Feature: the "post_action" directive. *) Feature: the ngx_http_empty_gif_module. *) Feature: the "worker_cpu_affinity" directive for Linux. *) Bugfix: the "rewrite" directive did not unescape URI part in redirect, now it is unescaped except the %00-%25 and %7F-%FF characters. *) Bugfix: nginx could not be built by the icc 9.0 compiler. *) Bugfix: if the SSI was enabled for zero size static file, then the chunked response was encoded incorrectly. --- src/imap/ngx_imap_proxy_module.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/imap/ngx_imap_proxy_module.c') diff --git a/src/imap/ngx_imap_proxy_module.c b/src/imap/ngx_imap_proxy_module.c index e1cccf122..62329607f 100644 --- a/src/imap/ngx_imap_proxy_module.c +++ b/src/imap/ngx_imap_proxy_module.c @@ -172,6 +172,7 @@ ngx_imap_proxy_imap_handler(ngx_event_t *rev) if (rev->timedout) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "upstream timed out"); + c->timedout = 1; ngx_imap_proxy_internal_server_error(s); return; } @@ -310,6 +311,7 @@ ngx_imap_proxy_pop3_handler(ngx_event_t *rev) if (rev->timedout) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "upstream timed out"); + c->timedout = 1; ngx_imap_proxy_internal_server_error(s); return; } @@ -501,6 +503,8 @@ ngx_imap_proxy_handler(ngx_event_t *ev) if (c == s->connection) { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out"); + c->timedout = 1; + } else { ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "upstream timed out"); @@ -652,9 +656,9 @@ ngx_imap_proxy_close_session(ngx_imap_session_t *s) static void * ngx_imap_proxy_create_conf(ngx_conf_t *cf) -{ +{ ngx_imap_proxy_conf_t *pcf; - + pcf = ngx_pcalloc(cf->pool, sizeof(ngx_imap_proxy_conf_t)); if (pcf == NULL) { return NGX_CONF_ERROR; -- cgit v1.2.1