Changeset 6721:48bab8b83f4e in nginx


Ignore:
Timestamp:
10/03/16 12:58:30 (3 years ago)
Author:
Ruslan Ermilov <ru@…>
Branch:
default
Phase:
public
Message:

Modules compatibility: removed two NGX_HAVE_DEFERRED_ACCEPT checks.

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

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/core/ngx_connection.h

    r6720 r6721  
    7474    unsigned            keepalive:2;
    7575
    76 #if (NGX_HAVE_DEFERRED_ACCEPT)
    7776    unsigned            deferred_accept:1;
    7877    unsigned            delete_deferred:1;
    7978    unsigned            add_deferred:1;
    80 #ifdef SO_ACCEPTFILTER
     79#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
    8180    char               *accept_filter;
    82 #endif
    8381#endif
    8482#if (NGX_HAVE_SETFIB)
  • src/core/ngx_module.h

    r6720 r6721  
    8181#endif
    8282
    83 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
    8483#define NGX_MODULE_SIGNATURE_12  "1"
    85 #else
    86 #define NGX_MODULE_SIGNATURE_12  "0"
    87 #endif
    8884
    8985#if (NGX_HAVE_SETFIB)
  • src/http/ngx_http_core_module.h

    r6720 r6721  
    7373    unsigned                   ipv6only:1;
    7474#endif
     75    unsigned                   deferred_accept:1;
    7576    unsigned                   reuseport:1;
    7677    unsigned                   so_keepalive:2;
     
    9495#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
    9596    char                      *accept_filter;
    96 #endif
    97 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
    98     ngx_uint_t                 deferred_accept;
    9997#endif
    10098
Note: See TracChangeset for help on using the changeset viewer.