Mercurial > hg > nginx
view src/http/modules/ngx_http_ssi_filter_module.h @ 7508:c30a20e06c21
Range filter: fixed duplicate last buffers.
In ngx_http_range_singlepart_body() special buffers where passed
unmodified, including ones after the end of the range. As such,
if the last buffer of a response was sent separately as a special
buffer, two buffers with b->last_buf set were present in the response.
In particular, this might result in a duplicate final chunk when using
chunked transfer encoding (normally range filter and chunked transfer
encoding are not used together, but this may happen if there are trailers
in the response). This also likely to cause problems in HTTP/2.
Fix is to skip all special buffers after we've sent the last part of
the range requested. These special buffers are not meaningful anyway,
since we set b->last_buf in the buffer with the last part of the range,
and everything is expected to be flushed due to it.
Additionally, ngx_http_next_body_filter() is now called even
if no buffers are to be passed to it. This ensures that various
write events are properly propagated through the filter chain. In
particular, this fixes test failures observed with the above change
and aio enabled.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 13 May 2019 22:44:49 +0300 |
parents | d620f497c50f |
children | 49e7db44b57c |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #ifndef _NGX_HTTP_SSI_FILTER_H_INCLUDED_ #define _NGX_HTTP_SSI_FILTER_H_INCLUDED_ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_http.h> #define NGX_HTTP_SSI_MAX_PARAMS 16 #define NGX_HTTP_SSI_COMMAND_LEN 32 #define NGX_HTTP_SSI_PARAM_LEN 32 #define NGX_HTTP_SSI_PARAMS_N 4 #define NGX_HTTP_SSI_COND_IF 1 #define NGX_HTTP_SSI_COND_ELSE 2 #define NGX_HTTP_SSI_NO_ENCODING 0 #define NGX_HTTP_SSI_URL_ENCODING 1 #define NGX_HTTP_SSI_ENTITY_ENCODING 2 typedef struct { ngx_hash_t hash; ngx_hash_keys_arrays_t commands; } ngx_http_ssi_main_conf_t; typedef struct { ngx_buf_t *buf; u_char *pos; u_char *copy_start; u_char *copy_end; ngx_uint_t key; ngx_str_t command; ngx_array_t params; ngx_table_elt_t *param; ngx_table_elt_t params_array[NGX_HTTP_SSI_PARAMS_N]; ngx_chain_t *in; ngx_chain_t *out; ngx_chain_t **last_out; ngx_chain_t *busy; ngx_chain_t *free; ngx_uint_t state; ngx_uint_t saved_state; size_t saved; size_t looked; size_t value_len; ngx_list_t *variables; ngx_array_t *blocks; #if (NGX_PCRE) ngx_uint_t ncaptures; int *captures; u_char *captures_data; #endif unsigned conditional:2; unsigned encoding:2; unsigned block:1; unsigned output:1; unsigned output_chosen:1; ngx_http_request_t *wait; void *value_buf; ngx_str_t timefmt; ngx_str_t errmsg; } ngx_http_ssi_ctx_t; typedef ngx_int_t (*ngx_http_ssi_command_pt) (ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx, ngx_str_t **); typedef struct { ngx_str_t name; ngx_uint_t index; unsigned mandatory:1; unsigned multiple:1; } ngx_http_ssi_param_t; typedef struct { ngx_str_t name; ngx_http_ssi_command_pt handler; ngx_http_ssi_param_t *params; unsigned conditional:2; unsigned block:1; unsigned flush:1; } ngx_http_ssi_command_t; extern ngx_module_t ngx_http_ssi_filter_module; #endif /* _NGX_HTTP_SSI_FILTER_H_INCLUDED_ */