From: Ruslan Ermilov <ru@nginx.com>
Date: Tue, 28 Dec 2021 12:01:02 +0000 (+0300)
Subject: Fixed a mismerge in 5c86189a1c1b.
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=05a32b5ec44e8fb54ea1976ec025a6ea650c36f9;p=nginx.git

Fixed a mismerge in 5c86189a1c1b.
---

diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index a5bdeaadd..91731c812 100644
--- 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_conf_t *cf, ngx_array_t **types,
 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, size_t len, u_char *dst,
     ngx_uint_t lower);
 #endif
 
+
 extern ngx_module_t  ngx_http_module;
 
 extern ngx_str_t  ngx_http_html_default_types[];