details: http://hg.nginx.org/nginx/rev/bdf64ae3376b
branches:
changeset: 6718:bdf64ae3376b
user: Maxim Dounin <mdounin@mdounin.ru>
date: Mon Oct 03 15:58:22 2016 +0300
description:
Modules compatibility: http2.

HTTP/2-specific fields in structures are now available unconditionally.
Removed NGX_HTTP_V2 from the signature accordingly.

diffstat:

src/core/ngx_module.h | 4 ----
src/http/ngx_http.h | 3 ---
src/http/ngx_http_core_module.h | 4 ----
src/http/ngx_http_request.h | 4 ----
4 files changed, 0 insertions(+), 15 deletions(-)

diffs (75 lines):

diff -r 3b522d7a5b34 -r bdf64ae3376b src/core/ngx_module.h
--- a/src/core/ngx_module.h Mon Oct 03 15:58:19 2016 +0300
+++ b/src/core/ngx_module.h Mon Oct 03 15:58:22 2016 +0300
@@ -158,11 +158,7 @@
#define NGX_MODULE_SIGNATURE_24 "0"
#endif

-#if (NGX_HTTP_V2)
#define NGX_MODULE_SIGNATURE_25 "1"
-#else
-#define NGX_MODULE_SIGNATURE_25 "0"
-#endif

#if (NGX_HTTP_GZIP)
#define NGX_MODULE_SIGNATURE_26 "1"
diff -r 3b522d7a5b34 -r bdf64ae3376b src/http/ngx_http.h
--- a/src/http/ngx_http.h Mon Oct 03 15:58:19 2016 +0300
+++ b/src/http/ngx_http.h Mon Oct 03 15:58:22 2016 +0300
@@ -19,10 +19,7 @@ typedef struct ngx_http_cache_s ng
typedef struct ngx_http_file_cache_s ngx_http_file_cache_t;
typedef struct ngx_http_log_ctx_s ngx_http_log_ctx_t;
typedef struct ngx_http_chunked_s ngx_http_chunked_t;
-
-#if (NGX_HTTP_V2)
typedef struct ngx_http_v2_stream_s ngx_http_v2_stream_t;
-#endif

typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
ngx_table_elt_t *h, ngx_uint_t offset);
diff -r 3b522d7a5b34 -r bdf64ae3376b src/http/ngx_http_core_module.h
--- a/src/http/ngx_http_core_module.h Mon Oct 03 15:58:19 2016 +0300
+++ b/src/http/ngx_http_core_module.h Mon Oct 03 15:58:22 2016 +0300
@@ -68,9 +68,7 @@ typedef struct {
#if (NGX_HTTP_SSL)
unsigned ssl:1;
#endif
-#if (NGX_HTTP_V2)
unsigned http2:1;
-#endif
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
unsigned ipv6only:1;
#endif
@@ -237,9 +235,7 @@ struct ngx_http_addr_conf_s {
#if (NGX_HTTP_SSL)
unsigned ssl:1;
#endif
-#if (NGX_HTTP_V2)
unsigned http2:1;
-#endif
unsigned proxy_protocol:1;
};

diff -r 3b522d7a5b34 -r bdf64ae3376b src/http/ngx_http_request.h
--- a/src/http/ngx_http_request.h Mon Oct 03 15:58:19 2016 +0300
+++ b/src/http/ngx_http_request.h Mon Oct 03 15:58:22 2016 +0300
@@ -286,9 +286,7 @@ typedef struct {
ngx_chain_t *bufs;
ngx_buf_t *buf;
off_t rest;
-#if (NGX_HTTP_V2)
off_t received;
-#endif
ngx_chain_t *free;
ngx_chain_t *busy;
ngx_http_chunked_t *chunked;
@@ -438,9 +436,7 @@ struct ngx_http_request_s {
ngx_uint_t err_status;

ngx_http_connection_t *http_connection;
-#if (NGX_HTTP_V2)
ngx_http_v2_stream_t *stream;
-#endif

ngx_http_log_handler_pt log_handler;


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel