Mercurial > hg > nginx

changeset 8954: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 03b40440c13d
children 32daba3aabb2
files src/http/ngx_http.h
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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[];