diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-10-18 14:27:16 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-10-18 14:27:16 +0000 |
| commit | c1484ffa6536aa093d3ad07bb2ae8894ffaee6ef (patch) | |
| tree | c92de697e86e80b5035082229f27484b9835e956 /src | |
| parent | 37188918ed415ef459ca00872adc7376f84bcd30 (diff) | |
| download | nginx-c1484ffa6536aa093d3ad07bb2ae8894ffaee6ef.tar.gz nginx-c1484ffa6536aa093d3ad07bb2ae8894ffaee6ef.zip | |
downgrade gravity of getsockname() errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_userid_filter_module.c | 8 | ||||
| -rw-r--r-- | src/http/ngx_http_variables.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c index c341a0873..b316630eb 100644 --- a/src/http/modules/ngx_http_userid_filter_module.c +++ b/src/http/modules/ngx_http_userid_filter_module.c @@ -348,10 +348,12 @@ ngx_http_userid_set_uid(ngx_http_request_t *r, ngx_http_userid_ctx_t *ctx, if (r->in_addr == 0) { slen = sizeof(struct sockaddr_in); if (getsockname(r->connection->fd, - (struct sockaddr *) &sin, &slen) == -1) + (struct sockaddr *) &sin, &slen) + == -1) { - ngx_log_error(NGX_LOG_CRIT, r->connection->log, - ngx_socket_errno, "getsockname() failed"); + ngx_connection_error(r->connection, ngx_socket_errno, + "getsockname() failed"); + return NGX_ERROR; } r->in_addr = sin.sin_addr.s_addr; diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index ecf20c372..120145829 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -749,8 +749,7 @@ ngx_http_variable_server_addr(ngx_http_request_t *r, if (r->in_addr == 0) { len = sizeof(struct sockaddr_in); if (getsockname(c->fd, (struct sockaddr *) &sin, &len) == -1) { - ngx_log_error(NGX_LOG_CRIT, c->log, - ngx_socket_errno, "getsockname() failed"); + ngx_connection_error(c, ngx_socket_errno, "getsockname() failed"); return NGX_ERROR; } |