diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-01 18:53:04 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-05-01 18:53:04 +0000 |
| commit | 1a537756bb9d3018ea6ab099b22e9734cc8a879d (patch) | |
| tree | 6d2fe235b46b0de3053db6c84739db4f34e674e7 /src/core/ngx_connection.c | |
| parent | b04081c3ce5d031367a0142d57e287e26ba2e415 (diff) | |
| download | nginx-0.7.54.tar.gz | |
Changes with nginx 0.7.54 01 May 2009v0.7.54
*) Feature: the ngx_http_image_filter_module.
*) Feature: the "proxy_ignore_headers" and "fastcgi_ignore_headers"
directives.
*) Bugfix: a segmentation fault might occur in worker process, if an
"open_file_cache_errors off" directive was used; the bug had
appeared in 0.7.53.
*) Bugfix: the "port_in_redirect off" directive did not work; the bug
had appeared in 0.7.39.
*) Bugfix: improve handling of "select" method errors.
*) Bugfix: of "select() failed (10022: ...)" error in nginx/Windows.
*) Bugfix: in error text descriptions in nginx/Windows; the bug had
appeared in 0.7.53.
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index ed9efe754..19344ab48 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -248,6 +248,8 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) continue; } + ls[i].log = *ls[i].logp; + if (ls[i].inherited) { /* TODO: close on exit */ @@ -801,7 +803,14 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) { ngx_uint_t level; - if (err == NGX_ECONNRESET && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) { + /* Winsock may return NGX_ECONNABORTED instead of NGX_ECONNRESET */ + + if ((err == NGX_ECONNRESET +#if (NGX_WIN32) + || err == NGX_ECONNABORTED +#endif + ) && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) + { return 0; } @@ -813,7 +822,9 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) if (err == 0 || err == NGX_ECONNRESET -#if !(NGX_WIN32) +#if (NGX_WIN32) + || err == NGX_ECONNABORTED +#else || err == NGX_EPIPE #endif || err == NGX_ENOTCONN |