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/ngx_http_request.h | |
| parent | 844c78556bc93343dd1c3c9236b5c16f4e2eac39 (diff) | |
| download | nginx-8fd8c32ccf7987f51d774edfcf7f5a65c75c137a.tar.gz nginx-8fd8c32ccf7987f51d774edfcf7f5a65c75c137a.zip | |
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 'src/http/ngx_http_request.h')
| -rw-r--r-- | src/http/ngx_http_request.h | 4 |
1 files changed, 1 insertions, 3 deletions
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; |