comparison src/imap/ngx_imap_proxy_module.c @ 126:df17fbafec8f NGINX_0_3_10

nginx 0.3.10 *) 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.
author Igor Sysoev <http://sysoev.ru>
date Tue, 15 Nov 2005 00:00:00 +0300
parents e85dca77c46a
children 91372f004adf
comparison
equal deleted inserted replaced
125:97504de1f89e 126:df17fbafec8f
170 s = c->data; 170 s = c->data;
171 171
172 if (rev->timedout) { 172 if (rev->timedout) {
173 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, 173 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
174 "upstream timed out"); 174 "upstream timed out");
175 c->timedout = 1;
175 ngx_imap_proxy_internal_server_error(s); 176 ngx_imap_proxy_internal_server_error(s);
176 return; 177 return;
177 } 178 }
178 179
179 if (s->proxy->buffer == NULL) { 180 if (s->proxy->buffer == NULL) {
308 s = c->data; 309 s = c->data;
309 310
310 if (rev->timedout) { 311 if (rev->timedout) {
311 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, 312 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
312 "upstream timed out"); 313 "upstream timed out");
314 c->timedout = 1;
313 ngx_imap_proxy_internal_server_error(s); 315 ngx_imap_proxy_internal_server_error(s);
314 return; 316 return;
315 } 317 }
316 318
317 if (s->proxy->buffer == NULL) { 319 if (s->proxy->buffer == NULL) {
499 501
500 if (ev->timedout) { 502 if (ev->timedout) {
501 if (c == s->connection) { 503 if (c == s->connection) {
502 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, 504 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
503 "client timed out"); 505 "client timed out");
506 c->timedout = 1;
507
504 } else { 508 } else {
505 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, 509 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
506 "upstream timed out"); 510 "upstream timed out");
507 } 511 }
508 512
650 } 654 }
651 655
652 656
653 static void * 657 static void *
654 ngx_imap_proxy_create_conf(ngx_conf_t *cf) 658 ngx_imap_proxy_create_conf(ngx_conf_t *cf)
655 { 659 {
656 ngx_imap_proxy_conf_t *pcf; 660 ngx_imap_proxy_conf_t *pcf;
657 661
658 pcf = ngx_pcalloc(cf->pool, sizeof(ngx_imap_proxy_conf_t)); 662 pcf = ngx_pcalloc(cf->pool, sizeof(ngx_imap_proxy_conf_t));
659 if (pcf == NULL) { 663 if (pcf == NULL) {
660 return NGX_CONF_ERROR; 664 return NGX_CONF_ERROR;
661 } 665 }
662 666