diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 17:51:31 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 17:51:31 +0300 |
| commit | cdc463042b9406e4703d21202bc363e86321bb5d (patch) | |
| tree | 1f6d050377dafbf42bb3d7c8c7e15e86939500ff /src/core | |
| parent | c20f0c28ff5478dcafd2ce2e5056da3757eb62ff (diff) | |
nginx-0.3.15-RELEASE importrelease-0.3.15
*) Feature: the new 444 code of the "return" directive to close
connection.
*) Feature: the "so_keepalive" directive in IMAP/POP3 proxy.
*) Bugfix: if there are unclosed connection nginx now calls abort()
only on gracefull quit and active "debug_points" directive.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_connection.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index f99cca8f9..80fd49837 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.14" +#define NGINX_VER "nginx/0.3.15" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 8a8f84a59..0820fede8 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -719,6 +719,9 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) || err == NGX_EPIPE #endif || err == NGX_ENOTCONN +#if !(NGX_CRIT_ETIMEDOUT) + || err == NGX_ETIMEDOUT +#endif || err == NGX_ECONNREFUSED || err == NGX_EHOSTUNREACH) { |