Mercurial > hg > nginx-vendor-current

comparison src/mail/ngx_mail_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 bf8b55a5ac89
children 660139fd80ca
comparison
equal deleted inserted replaced
681:625501f84a6b 682:5cb5db9975ba
372 372
373 ls->socklen = u.socklen; 373 ls->socklen = u.socklen;
374 ls->wildcard = u.wildcard; 374 ls->wildcard = u.wildcard;
375 ls->ctx = cf->ctx; 375 ls->ctx = cf->ctx;
376 376
377 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
378 ls->ipv6only = 1;
379 #endif
380
377 for (m = 0; ngx_modules[m]; m++) { 381 for (m = 0; ngx_modules[m]; m++) {
378 if (ngx_modules[m]->type != NGX_MAIL_MODULE) { 382 if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
379 continue; 383 continue;
380 } 384 }
381 385
411 415
412 if (ngx_strcmp(&value[i].data[10], "n") == 0) { 416 if (ngx_strcmp(&value[i].data[10], "n") == 0) {
413 ls->ipv6only = 1; 417 ls->ipv6only = 1;
414 418
415 } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) { 419 } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
416 ls->ipv6only = 2; 420 ls->ipv6only = 0;
417 421
418 } else { 422 } else {
419 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 423 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
420 "invalid ipv6only flags \"%s\"", 424 "invalid ipv6only flags \"%s\"",
421 &value[i].data[9]); 425 &value[i].data[9]);