From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 22 Jul 2020 11:48:49 +0000 (+0300)
Subject: QUIC: fixed bulding perl module by reducing header pollution.
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=ca0b9871bc74d7d4548d76eb4d4c2a3a5ebb22ec;p=nginx.git

QUIC: fixed bulding perl module by reducing header pollution.

The ngx_http_perl_module module doesn't have a notion of including additional
search paths through --with-cc-opt, which results in compile error incomplete
type 'enum ssl_encryption_level_t' when building nginx without QUIC support.
The enum is visible from quic event headers and eventually pollutes ngx_core.h.

The fix is to limit including headers to compile units that are real consumers.
---

diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index a8959ddcc..ade35be73 100644
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -86,8 +86,6 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
 #include <ngx_event_openssl.h>
 #if (NGX_OPENSSL_QUIC)
 #include <ngx_event_quic.h>
-#include <ngx_event_quic_transport.h>
-#include <ngx_event_quic_protection.h>
 #endif
 #endif
 #include <ngx_process_cycle.h>
diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c
index 202c0082a..9a8c94243 100644
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -7,6 +7,8 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
+#include <ngx_event_quic_transport.h>
+#include <ngx_event_quic_protection.h>
 
 
 /*  0-RTT and 1-RTT data exist in the same packet number space,
diff --git a/src/event/ngx_event_quic_protection.c b/src/event/ngx_event_quic_protection.c
index feba3eb3a..721944b97 100644
--- a/src/event/ngx_event_quic_protection.c
+++ b/src/event/ngx_event_quic_protection.c
@@ -7,6 +7,8 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
+#include <ngx_event_quic_transport.h>
+#include <ngx_event_quic_protection.h>
 
 
 #define NGX_QUIC_IV_LEN               12
diff --git a/src/event/ngx_event_quic_transport.c b/src/event/ngx_event_quic_transport.c
index bba9ae9cb..f1fc09449 100644
--- a/src/event/ngx_event_quic_transport.c
+++ b/src/event/ngx_event_quic_transport.c
@@ -7,6 +7,7 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_event.h>
+#include <ngx_event_quic_transport.h>
 
 
 #if (NGX_HAVE_NONALIGNED)