nginx: src/http/ngx_http_core_module.c comparison

use ngx_connection_local_sockaddr() instead of ngx_http_server_addr()

comparison

equal deleted inserted replaced

-:f9b5dfcc96d8
+:507fc5ac9839
 r->headers_in.user.len = len;
 r->headers_in.user.data = auth.data;
 r->headers_in.passwd.len = auth.len - len - 1;
 r->headers_in.passwd.data = &auth.data[len + 1];
-return NGX_OK;
-}
-ngx_int_t
-ngx_http_server_addr(ngx_http_request_t *r, ngx_str_t *s)
-{
-socklen_t             len;
-ngx_uint_t            addr;
-ngx_connection_t     *c;
-u_char                sa[NGX_SOCKADDRLEN];
-struct sockaddr_in   *sin;
-#if (NGX_HAVE_INET6)
-ngx_uint_t            i;
-struct sockaddr_in6  *sin6;
-#endif
-c = r->connection;
-switch (c->local_sockaddr->sa_family) {
-#if (NGX_HAVE_INET6)
-case AF_INET6:
-sin6 = (struct sockaddr_in6 *) c->local_sockaddr;
-for (addr = 0, i = 0; addr == 0 && i < 16; i++) {
-addr |= sin6->sin6_addr.s6_addr[i];
-}
-break;
-#endif
-default: /* AF_INET */
-sin = (struct sockaddr_in *) c->local_sockaddr;
-addr = sin->sin_addr.s_addr;
-break;
-}
-if (addr == 0) {
-len = NGX_SOCKADDRLEN;
-if (getsockname(c->fd, (struct sockaddr *) &sa, &len) == -1) {
-ngx_connection_error(c, ngx_socket_errno, "getsockname() failed");
-return NGX_ERROR;
-}
-c->local_sockaddr = ngx_palloc(r->connection->pool, len);
-if (c->local_sockaddr == NULL) {
-return NGX_ERROR;
-}
-c->local_socklen = len;
-ngx_memcpy(c->local_sockaddr, &sa, len);
-}
-if (s == NULL) {
-return NGX_OK;
-}
-s->len = ngx_sock_ntop(c->local_sockaddr, s->data, s->len, 0);
 return NGX_OK;
 }

Mercurial > hg > nginx