diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-28 06:14:50 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-28 06:14:50 +0000 |
| commit | 4cec79fb6a3138aeeee400b9c32f23a22cf2dac8 (patch) | |
| tree | 71ef80d2e71fdc81e756862eed80ae2c42288f53 /src/http/ngx_http_request.c | |
| parent | a30a028f14b18d7c12892d2fe79f457b4a67dd29 (diff) | |
| download | nginx-4cec79fb6a3138aeeee400b9c32f23a22cf2dac8.tar.gz nginx-4cec79fb6a3138aeeee400b9c32f23a22cf2dac8.zip | |
nginx-0.0.3-2004-04-28-10:14:50 import
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 1e0362107..d5496e227 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -192,8 +192,8 @@ static void ngx_http_init_request(ngx_event_t *rev) #endif len = sizeof(struct sockaddr_in); if (getsockname(c->fd, (struct sockaddr *) &addr_in, &len) == -1) { - ngx_log_error(NGX_LOG_CRIT, rev->log, ngx_socket_errno, - "getsockname() failed"); + ngx_connection_error(c, ngx_socket_errno, + "getsockname() failed"); ngx_http_close_connection(c); return; } @@ -1306,10 +1306,9 @@ static void ngx_http_set_keepalive(ngx_http_request_t *r) if (c->tcp_nopush == 1) { if (ngx_tcp_push(c->fd) == NGX_ERROR) { - ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, - ngx_tcp_push_n " failed"); - ngx_http_close_connection(c); - return; + ngx_connection_error(c, ngx_socket_errno, ngx_tcp_push_n " failed"); + ngx_http_close_connection(c); + return; } c->tcp_nopush = 0; } @@ -1415,8 +1414,8 @@ static void ngx_http_set_lingering_close(ngx_http_request_t *r) } if (ngx_shutdown_socket(c->fd, NGX_WRITE_SHUTDOWN) == -1) { - ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, - ngx_shutdown_socket_n " failed"); + ngx_connection_error(c, ngx_socket_errno, + ngx_shutdown_socket_n " failed"); ngx_http_close_request(r, 0); ngx_http_close_connection(c); return; |