Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 641:5e8fb59c18c1 release-0.3.42
nginx-0.3.42-RELEASE import
*) Feature: the "bind" option of the "listen" directive in IMAP/POP3
proxy.
*) Bugfix: if the same capture in the "rewrite" directive was used more
then once.
*) Bugfix: the $sent_http_content_type, $sent_http_content_length,
$sent_http_last_modified, $sent_http_connection,
$sent_http_keep_alive, and $sent_http_transfer_encoding variables
were not written to access log.
*) Bugfix: the $sent_http_cache_control returned value of the single
"Cache-Control" response header line.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 26 Apr 2006 09:52:47 +0000 |
parents | e60fe4cf1d4e |
children | 1e720b0be7ec |
comparison
equal
deleted
inserted
replaced
640:5fd31c2fe4a8 | 641:5e8fb59c18c1 |
---|---|
168 | 168 |
169 { ngx_string("Connection"), | 169 { ngx_string("Connection"), |
170 ngx_http_upstream_ignore_header_line, 0, | 170 ngx_http_upstream_ignore_header_line, 0, |
171 ngx_http_upstream_ignore_header_line, 0, 0 }, | 171 ngx_http_upstream_ignore_header_line, 0, 0 }, |
172 | 172 |
173 { ngx_string("Keep-Alive"), | |
174 ngx_http_upstream_ignore_header_line, 0, | |
175 ngx_http_upstream_ignore_header_line, 0, 0 }, | |
176 | |
173 { ngx_string("X-Pad"), | 177 { ngx_string("X-Pad"), |
174 ngx_http_upstream_ignore_header_line, 0, | 178 ngx_http_upstream_ignore_header_line, 0, |
175 ngx_http_upstream_ignore_header_line, 0, 0 }, | 179 ngx_http_upstream_ignore_header_line, 0, 0 }, |
176 | 180 |
177 { ngx_string("X-Powered-By"), | 181 { ngx_string("X-Powered-By"), |
624 ngx_http_upstream_finalize_request(r, u, | 628 ngx_http_upstream_finalize_request(r, u, |
625 NGX_HTTP_INTERNAL_SERVER_ERROR); | 629 NGX_HTTP_INTERNAL_SERVER_ERROR); |
626 return; | 630 return; |
627 } | 631 } |
628 | 632 |
633 r->connection->log->action = "SSL handshaking to upstream"; | |
634 | |
629 rc = ngx_ssl_handshake(c); | 635 rc = ngx_ssl_handshake(c); |
630 | 636 |
631 if (rc == NGX_AGAIN) { | 637 if (rc == NGX_AGAIN) { |
632 c->ssl->handler = ngx_http_upstream_ssl_handshake; | 638 c->ssl->handler = ngx_http_upstream_ssl_handshake; |
633 return; | 639 return; |
850 | 856 |
851 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, | 857 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, |
852 "http upstream send request handler"); | 858 "http upstream send request handler"); |
853 | 859 |
854 if (wev->timedout) { | 860 if (wev->timedout) { |
855 c->log->action = "sending request to upstream"; | |
856 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); | 861 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); |
857 return; | 862 return; |
858 } | 863 } |
859 | 864 |
860 #if (NGX_HTTP_SSL) | 865 #if (NGX_HTTP_SSL) |