comparison src/http/ngx_http_core_module.c @ 2528:c1975ccd0215

axe r->in_addr
author Igor Sysoev <igor@sysoev.ru>
date Mon, 23 Feb 2009 21:05:10 +0000
parents 52ce03b3ad18
children 339da812982c
comparison
equal deleted inserted replaced
2527:53e73282785f 2528:c1975ccd0215
1774 ngx_int_t 1774 ngx_int_t
1775 ngx_http_server_addr(ngx_http_request_t *r, ngx_str_t *s) 1775 ngx_http_server_addr(ngx_http_request_t *r, ngx_str_t *s)
1776 { 1776 {
1777 socklen_t len; 1777 socklen_t len;
1778 ngx_connection_t *c; 1778 ngx_connection_t *c;
1779 struct sockaddr_in *sin;
1780 u_char sa[NGX_SOCKADDRLEN]; 1779 u_char sa[NGX_SOCKADDRLEN];
1781 1780
1782 c = r->connection; 1781 c = r->connection;
1783 1782
1784 if (c->local_sockaddr == NULL) { 1783 if (c->local_sockaddr == NULL) {
1796 } 1795 }
1797 1796
1798 c->local_socklen = len; 1797 c->local_socklen = len;
1799 ngx_memcpy(c->local_sockaddr, &sa, len); 1798 ngx_memcpy(c->local_sockaddr, &sa, len);
1800 } 1799 }
1801
1802 sin = (struct sockaddr_in *) c->local_sockaddr;
1803 r->in_addr = sin->sin_addr.s_addr;
1804 1800
1805 if (s == NULL) { 1801 if (s == NULL) {
1806 return NGX_OK; 1802 return NGX_OK;
1807 } 1803 }
1808 1804
2063 2059
2064 if (c->data == r && r->postponed == NULL) { 2060 if (c->data == r && r->postponed == NULL) {
2065 c->data = sr; 2061 c->data = sr;
2066 } 2062 }
2067 2063
2068 sr->in_addr = r->in_addr;
2069 sr->port = r->port; 2064 sr->port = r->port;
2070 sr->port_text = r->port_text; 2065 sr->port_text = r->port_text;
2071 2066
2072 sr->variables = r->variables; 2067 sr->variables = r->variables;
2073 2068