details: http://hg.nginx.org/nginx/rev/48bab8b83f4e
branches:
changeset: 6721:48bab8b83f4e
user: Ruslan Ermilov <ru@nginx.com>
date: Mon Oct 03 15:58:30 2016 +0300
description:
Modules compatibility: removed two NGX_HAVE_DEFERRED_ACCEPT checks.

Removed (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
from the signature accordingly.

diffstat:

src/core/ngx_connection.h | 4 +---
src/core/ngx_module.h | 4 ----
src/http/ngx_http_core_module.h | 4 +---
3 files changed, 2 insertions(+), 10 deletions(-)

diffs (55 lines):

diff -r 9170240f1241 -r 48bab8b83f4e src/core/ngx_connection.h
--- a/src/core/ngx_connection.h Mon Oct 03 15:58:29 2016 +0300
+++ b/src/core/ngx_connection.h Mon Oct 03 15:58:30 2016 +0300
@@ -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 -r 9170240f1241 -r 48bab8b83f4e src/core/ngx_module.h
--- a/src/core/ngx_module.h Mon Oct 03 15:58:29 2016 +0300
+++ b/src/core/ngx_module.h Mon Oct 03 15:58:30 2016 +0300
@@ -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 -r 9170240f1241 -r 48bab8b83f4e src/http/ngx_http_core_module.h
--- a/src/http/ngx_http_core_module.h Mon Oct 03 15:58:29 2016 +0300
+++ b/src/http/ngx_http_core_module.h Mon Oct 03 15:58:30 2016 +0300
@@ -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;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel