# HG changeset patch # User Ruslan Ermilov # Date 1640692862 -10800 # Node ID 584e9951b044cde3b4962faeee9af4e540c42d35 # Parent 03b40440c13da3a05a77d61ec74712401e7aa2ac Fixed a mismerge in 5c86189a1c1b. diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -176,6 +176,7 @@ ngx_int_t ngx_http_set_default_types(ngx ngx_uint_t ngx_http_degraded(ngx_http_request_t *); #endif + #if (NGX_HTTP_V2 || NGX_HTTP_V3) 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); @@ -183,6 +184,7 @@ size_t ngx_http_huff_encode(u_char *src, ngx_uint_t lower); #endif + extern ngx_module_t ngx_http_module; extern ngx_str_t ngx_http_html_default_types[];