Changeset 6718:bdf64ae3376b in nginx


Ignore:
Timestamp:
10/03/16 12:58:22 (3 years ago)
Author:
Maxim Dounin <mdounin@…>
Branch:
default
Phase:
public
Message:

Modules compatibility: http2.

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

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/core/ngx_module.h

    r6717 r6718  
    159159#endif
    160160
    161 #if (NGX_HTTP_V2)
    162161#define NGX_MODULE_SIGNATURE_25  "1"
    163 #else
    164 #define NGX_MODULE_SIGNATURE_25  "0"
    165 #endif
    166162
    167163#if (NGX_HTTP_GZIP)
  • src/http/ngx_http.h

    r6246 r6718  
    2020typedef struct ngx_http_log_ctx_s     ngx_http_log_ctx_t;
    2121typedef struct ngx_http_chunked_s     ngx_http_chunked_t;
    22 
    23 #if (NGX_HTTP_V2)
    2422typedef struct ngx_http_v2_stream_s   ngx_http_v2_stream_t;
    25 #endif
    2623
    2724typedef ngx_int_t (*ngx_http_header_handler_pt)(ngx_http_request_t *r,
  • src/http/ngx_http_core_module.h

    r6717 r6718  
    6969    unsigned                   ssl:1;
    7070#endif
    71 #if (NGX_HTTP_V2)
    7271    unsigned                   http2:1;
    73 #endif
    7472#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
    7573    unsigned                   ipv6only:1;
     
    238236    unsigned                   ssl:1;
    239237#endif
    240 #if (NGX_HTTP_V2)
    241238    unsigned                   http2:1;
    242 #endif
    243239    unsigned                   proxy_protocol:1;
    244240};
  • src/http/ngx_http_request.h

    r6711 r6718  
    287287    ngx_buf_t                        *buf;
    288288    off_t                             rest;
    289 #if (NGX_HTTP_V2)
    290289    off_t                             received;
    291 #endif
    292290    ngx_chain_t                      *free;
    293291    ngx_chain_t                      *busy;
     
    439437
    440438    ngx_http_connection_t            *http_connection;
    441 #if (NGX_HTTP_V2)
    442439    ngx_http_v2_stream_t             *stream;
    443 #endif
    444440
    445441    ngx_http_log_handler_pt           log_handler;
Note: See TracChangeset for help on using the changeset viewer.