Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http.c @ 610:7ea1bba9a4f6 NGINX_0_9_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.9.3 *) Bugfix: if there was a single server for given IPv6 address:port pair, then captures in regular expressions in a "server_name" directive did not work. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 0.9.0.
author Igor Sysoev <http://sysoev.ru>
date Mon, 13 Dec 2010 00:00:00 +0300
parents 5dc296c4372a
children eb208e0cf44d
comparison
equal deleted inserted replaced
609:f6fa6099ee59 610:7ea1bba9a4f6
1500 &name[n].name, addr->opt.addr); 1500 &name[n].name, addr->opt.addr);
1501 return NGX_ERROR; 1501 return NGX_ERROR;
1502 } 1502 }
1503 1503
1504 if (rc == NGX_BUSY) { 1504 if (rc == NGX_BUSY) {
1505 ngx_log_error(NGX_LOG_WARN, cf->log, 0, 1505 ngx_log_error(NGX_LOG_WARN, cf->log, 0,
1506 "conflicting server name \"%V\" on %s, ignored", 1506 "conflicting server name \"%V\" on %s, ignored",
1507 &name[n].name, addr->opt.addr); 1507 &name[n].name, addr->opt.addr);
1508 } 1508 }
1509 } 1509 }
1510 } 1510 }
1868 #endif 1868 #endif
1869 1869
1870 if (addr[i].hash.buckets == NULL 1870 if (addr[i].hash.buckets == NULL
1871 && (addr[i].wc_head == NULL 1871 && (addr[i].wc_head == NULL
1872 || addr[i].wc_head->hash.buckets == NULL) 1872 || addr[i].wc_head->hash.buckets == NULL)
1873 && (addr[i].wc_head == NULL 1873 && (addr[i].wc_tail == NULL
1874 || addr[i].wc_head->hash.buckets == NULL)) 1874 || addr[i].wc_tail->hash.buckets == NULL)
1875 #if (NGX_PCRE)
1876 && addr[i].nregex == 0
1877 #endif
1878 )
1875 { 1879 {
1876 continue; 1880 continue;
1877 } 1881 }
1878 1882
1879 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); 1883 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t));