diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-09-08 14:36:09 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-09-08 14:36:09 +0000 |
| commit | e573380f247f4840dd27b40e76c587196a84f106 (patch) | |
| tree | 2bf9b16bbd3f9213fcb05fe3962938f24bf02677 /src/event/ngx_event_connect.c | |
| parent | 6f8cd96a9b0394589fbcfa75e9d26ef4f881d51b (diff) | |
| download | nginx-e573380f247f4840dd27b40e76c587196a84f106.tar.gz nginx-e573380f247f4840dd27b40e76c587196a84f106.tar.bz2 | |
nginx-0.1.45-RELEASE importrelease-0.1.45
*) Change: the "ssl_engine" directive was canceled in the
ngx_http_ssl_module and now is introduced at global level.
*) Bugfix: the responses with SSI subrequests did not transferred via
SSL connection.
*) Various bug fixes in the IMAP/POP3 proxy.
Diffstat (limited to 'src/event/ngx_event_connect.c')
| -rw-r--r-- | src/event/ngx_event_connect.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index 7cab38cb7..be1d9638a 100644 --- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -17,7 +17,7 @@ ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc) { int rc; - ngx_uint_t instance; + ngx_uint_t instance, level; u_int event; time_t now; ngx_err_t err; @@ -283,20 +283,15 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) /* Winsock returns WSAEWOULDBLOCK (NGX_EAGAIN) */ if (err != NGX_EINPROGRESS && err != NGX_EAGAIN) { - ngx_connection_error(c, err, "connect() failed"); -#if 0 -#undef sun - { - struct sockaddr_un *sun; - - sun = (struct sockaddr_un *) peer->sockaddr; - - ngx_log_error(NGX_LOG_ALERT, pc->log, 0, - "\"%s\", f:%d, l:%uz", - sun->sun_path, sun->sun_family, peer->socklen); + if (err == NGX_ECONNREFUSED || err == NGX_EHOSTUNREACH) { + level = NGX_LOG_ERR; + } else { + level = NGX_LOG_CRIT; } -#endif + + ngx_log_error(level, c->log, err, "connect() to %V failed", + &peer->name); return NGX_CONNECT_ERROR; } |