Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 2689:6caf687a831f
backout r2535: virtual names is a property of address:port pair,
but is not a property of server configuration
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 09 Apr 2009 13:56:16 +0000 |
parents | 9bcda0da8d36 |
children | d478379e51ac |
comparison
equal
deleted
inserted
replaced
2688:9bcda0da8d36 | 2689:6caf687a831f |
---|---|
1823 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); | 1823 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); |
1824 if (vn == NULL) { | 1824 if (vn == NULL) { |
1825 return NGX_ERROR; | 1825 return NGX_ERROR; |
1826 } | 1826 } |
1827 | 1827 |
1828 addrs[i].conf.core_srv_conf->virtual_names = vn; | 1828 addrs[i].conf.virtual_names = vn; |
1829 | 1829 |
1830 vn->names.hash = addr[i].hash; | 1830 vn->names.hash = addr[i].hash; |
1831 vn->names.wc_head = addr[i].wc_head; | 1831 vn->names.wc_head = addr[i].wc_head; |
1832 vn->names.wc_tail = addr[i].wc_tail; | 1832 vn->names.wc_tail = addr[i].wc_tail; |
1833 #if (NGX_PCRE) | 1833 #if (NGX_PCRE) |
1880 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); | 1880 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); |
1881 if (vn == NULL) { | 1881 if (vn == NULL) { |
1882 return NGX_ERROR; | 1882 return NGX_ERROR; |
1883 } | 1883 } |
1884 | 1884 |
1885 addrs6[i].conf.core_srv_conf->virtual_names = vn; | 1885 addrs6[i].conf.virtual_names = vn; |
1886 | 1886 |
1887 vn->names.hash = addr[i].hash; | 1887 vn->names.hash = addr[i].hash; |
1888 vn->names.wc_head = addr[i].wc_head; | 1888 vn->names.wc_head = addr[i].wc_head; |
1889 vn->names.wc_tail = addr[i].wc_tail; | 1889 vn->names.wc_tail = addr[i].wc_tail; |
1890 #if (NGX_PCRE) | 1890 #if (NGX_PCRE) |