mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 14:56:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modules compatibility: http2.

Browse Source 
HTTP/2-specific fields in structures are now available unconditionally.
Removed NGX_HTTP_V2 from the signature accordingly.
This commit is contained in:
Maxim Dounin 2016-10-03 15:58:22 +03:00
parent 2641022229
commit a7f80ec354
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ngx_module.h
View File

@ -158,11 +158,7 @@
#define NGX_MODULE_SIGNATURE_24 "0" #define NGX_MODULE_SIGNATURE_24 "0"
#endif #endif
#if (NGX_HTTP_V2)
#define NGX_MODULE_SIGNATURE_25 "1" #define NGX_MODULE_SIGNATURE_25 "1"
#else
#define NGX_MODULE_SIGNATURE_25 "0"
#endif
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
#define NGX_MODULE_SIGNATURE_26 "1" #define NGX_MODULE_SIGNATURE_26 "1"

3
src/http/ngx_http.h
View File

@ -19,10 +19,7 @@ typedef struct ngx_http_cache_s ngx_http_cache_t;
typedef struct ngx_http_file_cache_s ngx_http_file_cache_t; 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_log_ctx_s ngx_http_log_ctx_t;
typedef struct ngx_http_chunked_s ngx_http_chunked_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; 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, typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
ngx_table_elt_t *h, ngx_uint_t offset); ngx_table_elt_t *h, ngx_uint_t offset);

4
src/http/ngx_http_core_module.h
View File

@ -68,9 +68,7 @@ typedef struct {
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
unsigned ssl:1; unsigned ssl:1;
#endif #endif
#if (NGX_HTTP_V2)
unsigned http2:1; unsigned http2:1;
#endif
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
unsigned ipv6only:1; unsigned ipv6only:1;
#endif #endif
@ -237,9 +235,7 @@ struct ngx_http_addr_conf_s {
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
unsigned ssl:1; unsigned ssl:1;
#endif #endif
#if (NGX_HTTP_V2)
unsigned http2:1; unsigned http2:1;
#endif
unsigned proxy_protocol:1; unsigned proxy_protocol:1;
}; };

4
src/http/ngx_http_request.h
View File

@ -286,9 +286,7 @@ typedef struct {
ngx_chain_t *bufs; ngx_chain_t *bufs;
ngx_buf_t *buf; ngx_buf_t *buf;
off_t rest; off_t rest;
#if (NGX_HTTP_V2)
off_t received; off_t received;
#endif
ngx_chain_t *free; ngx_chain_t *free;
ngx_chain_t *busy; ngx_chain_t *busy;
ngx_http_chunked_t *chunked; ngx_http_chunked_t *chunked;
@ -438,9 +436,7 @@ struct ngx_http_request_s {
ngx_uint_t err_status; ngx_uint_t err_status;
ngx_http_connection_t *http_connection; ngx_http_connection_t *http_connection;
#if (NGX_HTTP_V2)
ngx_http_v2_stream_t *stream; ngx_http_v2_stream_t *stream;
#endif
ngx_http_log_handler_pt log_handler; ngx_http_log_handler_pt log_handler;