[nginx] Removed influence of some options on structures.
Ruslan Ermilov
ru at nginx.com
Tue Sep 20 09:35:43 UTC 2016
details: http://hg.nginx.org/nginx/rev/e8d4c9e9682a
branches:
changeset: 6698:e8d4c9e9682a
user: Ruslan Ermilov <ru at nginx.com>
date: Tue Sep 20 12:30:52 2016 +0300
description:
Removed influence of some options on structures.
diffstat:
src/core/ngx_buf.h | 2 --
src/event/ngx_event_connect.h | 2 --
src/http/ngx_http_request.h | 5 +----
3 files changed, 1 insertions(+), 8 deletions(-)
diffs (50 lines):
diff -r 52367732bcbc -r e8d4c9e9682a src/core/ngx_buf.h
--- a/src/core/ngx_buf.h Fri Sep 16 15:13:24 2016 +0300
+++ b/src/core/ngx_buf.h Tue Sep 20 12:30:52 2016 +0300
@@ -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 -r 52367732bcbc -r e8d4c9e9682a src/event/ngx_event_connect.h
--- a/src/event/ngx_event_connect.h Fri Sep 16 15:13:24 2016 +0300
+++ b/src/event/ngx_event_connect.h Tue Sep 20 12:30:52 2016 +0300
@@ -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 -r 52367732bcbc -r e8d4c9e9682a src/http/ngx_http_request.h
--- a/src/http/ngx_http_request.h Fri Sep 16 15:13:24 2016 +0300
+++ b/src/http/ngx_http_request.h Tue Sep 20 12:30:52 2016 +0300
@@ -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 */
More information about the nginx-devel
mailing list