diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-10 18:44:17 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-10 18:44:17 +0300 |
| commit | 8fd8c32ccf7987f51d774edfcf7f5a65c75c137a (patch) | |
| tree | 24450b882b29d4972fce76966b6f0f5d743f7a19 /src/http | |
| parent | 844c78556bc93343dd1c3c9236b5c16f4e2eac39 (diff) | |
| download | nginx-8fd8c32ccf7987f51d774edfcf7f5a65c75c137a.tar.gz nginx-8fd8c32ccf7987f51d774edfcf7f5a65c75c137a.tar.bz2 | |
Modules compatibility: compatibility with NGX_HTTP_SSL.
With this change it is now possible to load modules compiled without
the "--with-http_ssl_module" configure option into nginx binary compiled
with it, and vice versa (if a module doesn't use ssl-specific functions),
assuming both use the "--with-compat" option.
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http_core_module.h | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_request.h | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.h | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.h | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h index 7140a6b7a..ade9abbe5 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -67,9 +67,7 @@ typedef struct { unsigned default_server:1; unsigned bind:1; unsigned wildcard:1; -#if (NGX_HTTP_SSL) unsigned ssl:1; -#endif unsigned http2:1; #if (NGX_HAVE_INET6) unsigned ipv6only:1; @@ -230,9 +228,7 @@ struct ngx_http_addr_conf_s { ngx_http_virtual_names_t *virtual_names; -#if (NGX_HTTP_SSL) unsigned ssl:1; -#endif unsigned http2:1; unsigned proxy_protocol:1; }; diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index ee609adbb..cf9ee3c61 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -300,7 +300,7 @@ typedef struct { ngx_http_addr_conf_t *addr_conf; ngx_http_conf_ctx_t *conf_ctx; -#if (NGX_HTTP_SSL) +#if (NGX_HTTP_SSL || NGX_COMPAT) ngx_str_t *ssl_servername; #if (NGX_PCRE) ngx_http_regex_t *ssl_servername_regex; @@ -313,9 +313,7 @@ typedef struct { ngx_buf_t **free; ngx_int_t nfree; -#if (NGX_HTTP_SSL) unsigned ssl:1; -#endif unsigned proxy_protocol:1; } ngx_http_connection_t; diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index e6bf3c983..3d521f2f0 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -222,7 +222,7 @@ typedef struct { unsigned intercept_404:1; unsigned change_buffering:1; -#if (NGX_HTTP_SSL) +#if (NGX_HTTP_SSL || NGX_COMPAT) ngx_ssl_t *ssl; ngx_flag_t ssl_session_reuse; @@ -367,7 +367,7 @@ struct ngx_http_upstream_s { ngx_str_t schema; ngx_str_t uri; -#if (NGX_HTTP_SSL) +#if (NGX_HTTP_SSL || NGX_COMPAT) ngx_str_t ssl_name; #endif diff --git a/src/http/ngx_http_upstream_round_robin.h b/src/http/ngx_http_upstream_round_robin.h index 92aa1a60c..45f258d28 100644 --- a/src/http/ngx_http_upstream_round_robin.h +++ b/src/http/ngx_http_upstream_round_robin.h @@ -40,7 +40,7 @@ struct ngx_http_upstream_rr_peer_s { ngx_uint_t down; -#if (NGX_HTTP_SSL) +#if (NGX_HTTP_SSL || NGX_COMPAT) void *ssl_session; int ssl_session_len; #endif |