From 1fd83ac0c83b2ffffbe5fdbaec61be4f1b39171b Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Tue, 20 Sep 2016 12:30:52 +0300 Subject: [PATCH] Removed influence of some options on structures. --- src/core/ngx_buf.h | 2 -- src/event/ngx_event_connect.h | 2 -- src/http/ngx_http_request.h | 5 +---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/ngx_buf.h b/src/core/ngx_buf.h index f652b20ef..00522cce5 100644 --- a/src/core/ngx_buf.h +++ b/src/core/ngx_buf.h @@ -85,9 +85,7 @@ struct ngx_output_chain_ctx_s { unsigned sendfile:1; unsigned directio:1; -#if (NGX_HAVE_ALIGNED_DIRECTIO) unsigned unaligned:1; -#endif unsigned need_in_memory:1; unsigned need_in_temp:1; #if (NGX_HAVE_FILE_AIO || NGX_THREADS) diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h index 10b72a154..25809d047 100644 --- a/src/event/ngx_event_connect.h +++ b/src/event/ngx_event_connect.h @@ -61,9 +61,7 @@ struct ngx_peer_connection_s { ngx_log_t *log; unsigned cached:1; -#if (NGX_HAVE_TRANSPARENT_PROXY) unsigned transparent:1; -#endif /* ngx_connection_log_error_e */ unsigned log_error:2; diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index 499c1eff5..a641d78fd 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -302,7 +302,7 @@ typedef struct { ngx_http_addr_conf_t *addr_conf; ngx_http_conf_ctx_t *conf_ctx; -#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) +#if (NGX_HTTP_SSL) ngx_str_t *ssl_servername; #if (NGX_PCRE) ngx_http_regex_t *ssl_servername_regex; @@ -539,11 +539,8 @@ struct ngx_http_request_s { unsigned subrequest_ranges:1; unsigned single_range:1; unsigned disable_not_modified:1; - -#if (NGX_STAT_STUB) unsigned stat_reading:1; unsigned stat_writing:1; -#endif /* used to parse HTTP headers */