diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-04-26 09:52:47 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-04-26 09:52:47 +0000 |
| commit | 7f7846d8208c9179b7632eddc4a3165b3b10afbb (patch) | |
| tree | d3255703d466de2d0e9199cad9186b227798d7cc /src/http/ngx_http_upstream.c | |
| parent | 5026d3799b88b715bfe12c836d4263e861822cad (diff) | |
| download | nginx-release-0.3.42.tar.gz nginx-release-0.3.42.tar.bz2 | |
nginx-0.3.42-RELEASE importrelease-0.3.42
*) 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.
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 997038c9c..45e586f9d 100644 --- 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_upstream_headers_in[] = { 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(ngx_http_request_t *r, 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(ngx_event_t *wev) "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; } |