diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-07-30 12:27:06 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-07-30 12:27:06 +0000 |
| commit | deaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f (patch) | |
| tree | acf6297d9229f9b2c0da4bfb9a918912096aa2ba /src/mail | |
| parent | 9c8f3d86b4c4c1bb04057e57f798e4244cefcbcf (diff) | |
| download | nginx-deaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f.tar.gz nginx-deaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f.tar.bz2 | |
Core: ipv6only is now on by default.
There is a general consensus that this change results in better
consistency between different operating systems and differently
tuned operating systems.
Note: this changes the width and meaning of the ipv6only field
of the ngx_listening_t structure. 3rd party modules that create
their own listening sockets might need fixing.
Diffstat (limited to 'src/mail')
| -rw-r--r-- | src/mail/ngx_mail.h | 4 | ||||
| -rw-r--r-- | src/mail/ngx_mail_core_module.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h index 1fceb4285..ccdfb8c6f 100644 --- a/src/mail/ngx_mail.h +++ b/src/mail/ngx_mail.h @@ -39,7 +39,7 @@ typedef struct { unsigned ssl:1; #endif #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) - unsigned ipv6only:2; + unsigned ipv6only:1; #endif unsigned so_keepalive:2; #if (NGX_HAVE_KEEPALIVE_TUNABLE) @@ -100,7 +100,7 @@ typedef struct { unsigned ssl:1; #endif #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) - unsigned ipv6only:2; + unsigned ipv6only:1; #endif unsigned so_keepalive:2; #if (NGX_HAVE_KEEPALIVE_TUNABLE) diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c index f79913b0a..f0dee7283 100644 --- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -374,6 +374,10 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ls->wildcard = u.wildcard; ls->ctx = cf->ctx; +#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) + ls->ipv6only = 1; +#endif + for (m = 0; ngx_modules[m]; m++) { if (ngx_modules[m]->type != NGX_MAIL_MODULE) { continue; @@ -413,7 +417,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ls->ipv6only = 1; } else if (ngx_strcmp(&value[i].data[10], "ff") == 0) { - ls->ipv6only = 2; + ls->ipv6only = 0; } else { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |