Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -170,6 +170,10 @@ ngx_http_upstream_header_t ngx_http_ups ngx_http_upstream_ignore_header_line, 0, ngx_http_upstream_ignore_header_line, 0, 0 }, + { ngx_string("Keep-Alive"), + ngx_http_upstream_ignore_header_line, 0, + ngx_http_upstream_ignore_header_line, 0, 0 }, + { ngx_string("X-Pad"), ngx_http_upstream_ignore_header_line, 0, ngx_http_upstream_ignore_header_line, 0, 0 }, @@ -626,6 +630,8 @@ ngx_http_upstream_ssl_init_connection(ng return; } + r->connection->log->action = "SSL handshaking to upstream"; + rc = ngx_ssl_handshake(c); if (rc == NGX_AGAIN) { @@ -852,7 +858,6 @@ ngx_http_upstream_send_request_handler(n "http upstream send request handler"); if (wev->timedout) { - c->log->action = "sending request to upstream"; ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); return; }