Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 682:5cb5db9975ba NGINX_1_3_4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.4 *) Change: the "ipv6only" parameter is now turned on by default for listening IPv6 sockets. *) Feature: the Clang compiler support. *) Bugfix: extra listening sockets might be created. Thanks to Roman Odaisky. *) Bugfix: nginx/Windows might hog CPU if a worker process failed to start. Thanks to Ricardo Villalobos Guevara. *) Bugfix: the "proxy_pass_header", "fastcgi_pass_header", "scgi_pass_header", "uwsgi_pass_header", "proxy_hide_header", "fastcgi_hide_header", "scgi_hide_header", and "uwsgi_hide_header" directives might be inherited incorrectly.
author Igor Sysoev <http://sysoev.ru>
date Tue, 31 Jul 2012 00:00:00 +0400
parents 597573166f34
children 660139fd80ca
comparison
equal deleted inserted replaced
681:625501f84a6b 682:5cb5db9975ba
220 NGX_HTTP_MAIN_CONF_OFFSET, 220 NGX_HTTP_MAIN_CONF_OFFSET,
221 offsetof(ngx_http_core_main_conf_t, server_names_hash_bucket_size), 221 offsetof(ngx_http_core_main_conf_t, server_names_hash_bucket_size),
222 NULL }, 222 NULL },
223 223
224 { ngx_string("server"), 224 { ngx_string("server"),
225 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_MULTI|NGX_CONF_NOARGS, 225 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
226 ngx_http_core_server, 226 ngx_http_core_server,
227 0, 227 0,
228 0, 228 0,
229 NULL }, 229 NULL },
230 230
3910 lsopt.sndbuf = -1; 3910 lsopt.sndbuf = -1;
3911 #if (NGX_HAVE_SETFIB) 3911 #if (NGX_HAVE_SETFIB)
3912 lsopt.setfib = -1; 3912 lsopt.setfib = -1;
3913 #endif 3913 #endif
3914 lsopt.wildcard = u.wildcard; 3914 lsopt.wildcard = u.wildcard;
3915 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
3916 lsopt.ipv6only = 1;
3917 #endif
3915 3918
3916 (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.addr, 3919 (void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.addr,
3917 NGX_SOCKADDR_STRLEN, 1); 3920 NGX_SOCKADDR_STRLEN, 1);
3918 3921
3919 for (n = 2; n < cf->args->nelts; n++) { 3922 for (n = 2; n < cf->args->nelts; n++) {
4029 4032
4030 if (ngx_strcmp(&value[n].data[10], "n") == 0) { 4033 if (ngx_strcmp(&value[n].data[10], "n") == 0) {
4031 lsopt.ipv6only = 1; 4034 lsopt.ipv6only = 1;
4032 4035
4033 } else if (ngx_strcmp(&value[n].data[10], "ff") == 0) { 4036 } else if (ngx_strcmp(&value[n].data[10], "ff") == 0) {
4034 lsopt.ipv6only = 2; 4037 lsopt.ipv6only = 0;
4035 4038
4036 } else { 4039 } else {
4037 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 4040 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
4038 "invalid ipv6only flags \"%s\"", 4041 "invalid ipv6only flags \"%s\"",
4039 &value[n].data[9]); 4042 &value[n].data[9]);