Mercurial > hg > nginx

diff src/stream/ngx_stream.h @ 6736:f41c2530dd17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modules compatibility: removed dependencies on NGX_STREAM_SSL. External structures are now identical regardless of stream SSL module compiled in or not.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 10 Oct 2016 18:44:17 +0300
parents 9170240f1241
children d2b2ff157da5
line wrap: on
line diff
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -49,9 +49,7 @@ typedef struct {
 
     unsigned                       bind:1;
     unsigned                       wildcard:1;
-#if (NGX_STREAM_SSL)
     unsigned                       ssl:1;
-#endif
 #if (NGX_HAVE_INET6)
     unsigned                       ipv6only:1;
 #endif
@@ -71,9 +69,7 @@ typedef struct {
 typedef struct {
     ngx_stream_conf_ctx_t         *ctx;
     ngx_str_t                      addr_text;
-#if (NGX_STREAM_SSL)
     unsigned                       ssl:1;
-#endif
     unsigned                       proxy_protocol:1;
 } ngx_stream_addr_conf_t;
 
@@ -117,9 +113,7 @@ typedef enum {
     NGX_STREAM_POST_ACCEPT_PHASE = 0,
     NGX_STREAM_PREACCESS_PHASE,
     NGX_STREAM_ACCESS_PHASE,
-#if (NGX_STREAM_SSL)
     NGX_STREAM_SSL_PHASE,
-#endif
     NGX_STREAM_PREREAD_PHASE,
     NGX_STREAM_CONTENT_PHASE,
     NGX_STREAM_LOG_PHASE
@@ -223,9 +217,7 @@ struct ngx_stream_session_s {
     ngx_int_t                      phase_handler;
     ngx_uint_t                     status;
 
-#if (NGX_STREAM_SSL)
     unsigned                       ssl:1;
-#endif
 
     unsigned                       stat_processing:1;