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

Fixed a mismerge in 5c86189a1c1b.

Browse Source
This commit is contained in:
Ruslan Ermilov 2021-12-28 15:01:02 +03:00
parent 3662e0c83b
commit 05a32b5ec4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/ngx_http.h
View File

@ -176,6 +176,7 @@ ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types,
ngx_uint_t ngx_http_degraded(ngx_http_request_t *); ngx_uint_t ngx_http_degraded(ngx_http_request_t *);
#endif #endif
#if (NGX_HTTP_V2 || NGX_HTTP_V3) #if (NGX_HTTP_V2 || NGX_HTTP_V3)
ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len, ngx_int_t ngx_http_huff_decode(u_char *state, u_char *src, size_t len,
u_char **dst, ngx_uint_t last, ngx_log_t *log); u_char **dst, ngx_uint_t last, ngx_log_t *log);
@ -183,6 +184,7 @@ size_t ngx_http_huff_encode(u_char *src, size_t len, u_char *dst,
ngx_uint_t lower); ngx_uint_t lower);
#endif #endif
extern ngx_module_t ngx_http_module; extern ngx_module_t ngx_http_module;
extern ngx_str_t ngx_http_html_default_types[]; extern ngx_str_t ngx_http_html_default_types[];