downgrade gravity of getsockname() errors

diff --git a/src/http/modules/ngx_http_userid_filter_module.c b/src/http/modules/ngx_http_userid_filter_module.c
index c341a08730ad11703c0752be3481c295fd696761..b316630eb0148ee309731a95107c43ab925a16fe 100644 (file)
--- 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 ecf20c372160a5f96af79627f2c8e5b1d04868a6..12014582943a64cfc253c3f19bee20cdfa198413 100644 (file)
--- 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;
         }