diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2016-10-03 15:58:30 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2016-10-03 15:58:30 +0300 |
| commit | 2e12afb955a211f55bfdcb3f3d92fc1b42d9dc99 (patch) | |
| tree | 28b339219f9cd6e9f2b5f1a8dc9bc12da97d5028 /src | |
| parent | 58b85017a4063916b010de75e7c153576cf660ea (diff) | |
| download | nginx-2e12afb955a211f55bfdcb3f3d92fc1b42d9dc99.tar.gz nginx-2e12afb955a211f55bfdcb3f3d92fc1b42d9dc99.zip | |
Modules compatibility: removed two NGX_HAVE_DEFERRED_ACCEPT checks.
Removed (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
from the signature accordingly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_connection.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_module.h | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.h | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index 36907dda7..1472090e5 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -73,14 +73,12 @@ struct ngx_listening_s { unsigned add_reuseport:1; unsigned keepalive:2; -#if (NGX_HAVE_DEFERRED_ACCEPT) unsigned deferred_accept:1; unsigned delete_deferred:1; unsigned add_deferred:1; -#ifdef SO_ACCEPTFILTER +#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) char *accept_filter; #endif -#endif #if (NGX_HAVE_SETFIB) int setfib; #endif diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h index 51a9baa06..10a7eabaf 100644 --- a/src/core/ngx_module.h +++ b/src/core/ngx_module.h @@ -80,11 +80,7 @@ #define NGX_MODULE_SIGNATURE_11 "0" #endif -#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) #define NGX_MODULE_SIGNATURE_12 "1" -#else -#define NGX_MODULE_SIGNATURE_12 "0" -#endif #if (NGX_HAVE_SETFIB) #define NGX_MODULE_SIGNATURE_13 "1" diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h index 78f69e224..628679ff3 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -72,6 +72,7 @@ typedef struct { #if (NGX_HAVE_INET6) unsigned ipv6only:1; #endif + unsigned deferred_accept:1; unsigned reuseport:1; unsigned so_keepalive:2; unsigned proxy_protocol:1; @@ -94,9 +95,6 @@ typedef struct { #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) char *accept_filter; #endif -#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) - ngx_uint_t deferred_accept; -#endif u_char addr[NGX_SOCKADDR_STRLEN + 1]; } ngx_http_listen_opt_t; |