1 files changed, 4 insertions, 7 deletions

diff --git a/www/apache24/Makefile.options b/www/apache24/Makefile.options
index 7298a6f3d0c8..2bf0235ee615 100644
--- a/www/apache24/Makefile.options
+++ b/www/apache24/Makefile.options
@@ -11,11 +11,10 @@
 
 # mod_proxy_html and xml2enc depending on libxml2
 PROXY_ENABLED_MODULES= \
-	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
+	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI PROXY_HTTP2 \
 	PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL
 
-PROXY_DISABLED_MODULES=	\
-	PROXY_HTTP2
+PROXY_DISABLED_MODULES=
 
 # SESSION_CRYPTO need APR build with crypto (EVP support in APR)
 SESSION_ENABLED_MODULES= \
@@ -40,7 +39,7 @@ MOST_ENABLED_MODULES= \
 	DATA DAV DAV_FS DAV_LOCK DBD DEFLATE DIALUP DIR DUMPIO \
 	ENV EXPIRES EXT_FILTER \
 	FILE_CACHE FILTER \
-	HEADERS HEARTBEAT HEARTMONITOR \
+	HEADERS HEARTBEAT HEARTMONITOR HTTP2 \
 	IMAGEMAP INCLUDE INFO \
 	LBMETHOD_BYBUSYNESS LBMETHOD_BYREQUESTS LBMETHOD_BYTRAFFIC \
 	LBMETHOD_HEARTBEAT LOGIO LOG_DEBUG LOG_FORENSIC \
@@ -55,9 +54,8 @@ MOST_ENABLED_MODULES= \
 	WATCHDOG XML2ENC
 
 MOST_DISABLED_MODULES:= \
-	AUTHNZ_LDAP IDENT LDAP LUA SOCACHE_DC SUEXEC HTTP2
+	AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SUEXEC
 
-# XXX PROXY and SESSION are modules but also used to
 #     enable/disable additional PROXY/SESSION modules
 META_MODULES=	PROXY SESSION
 
@@ -100,4 +98,3 @@ OPTIONS_DEFAULT:=		\
 	${PROXY_ENABLED_MODULES} \
 	MPM_SHARED \
 	MPM_PREFORK
-