Mercurial > hg > nginx-quic

comparison src/http/ngx_http.h @ 8767:584e9951b044 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a mismerge in 5c86189a1c1b.
author Ruslan Ermilov <ru@nginx.com>
date Tue, 28 Dec 2021 15:01:02 +0300
parents 5c86189a1c1b
children 8d0753760546
comparison
equal deleted inserted replaced
8766:03b40440c13d 8767:584e9951b044
174 174
175 #if (NGX_HTTP_DEGRADATION) 175 #if (NGX_HTTP_DEGRADATION)
176 ngx_uint_t ngx_http_degraded(ngx_http_request_t *); 176 ngx_uint_t ngx_http_degraded(ngx_http_request_t *);
177 #endif 177 #endif
178 178
179
179 #if (NGX_HTTP_V2 || NGX_HTTP_V3) 180 #if (NGX_HTTP_V2 || NGX_HTTP_V3)
180 ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len, 181 ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len,
181 u_char **dst, ngx_uint_t last, ngx_log_t *log); 182 u_char **dst, ngx_uint_t last, ngx_log_t *log);
182 size_t ngx_http_huff_encode(u_char *src, size_t len, u_char *dst, 183 size_t ngx_http_huff_encode(u_char *src, size_t len, u_char *dst,
183 ngx_uint_t lower); 184 ngx_uint_t lower);
184 #endif 185 #endif
186
185 187
186 extern ngx_module_t ngx_http_module; 188 extern ngx_module_t ngx_http_module;
187 189
188 extern ngx_str_t ngx_http_html_default_types[]; 190 extern ngx_str_t ngx_http_html_default_types[];
189 191