From 2892a7bf3f8ce92f41134fab25fbc2057f4a36bf Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Wed, 10 May 2023 19:06:42 -0400
Subject: [mod_h2] HTTP/2 separate module; no longer builtin

HTTP/2 separate module; no longer built-in to lighttpd executable
---
 src/CMakeLists.txt | 3 ---
 src/Makefile.am    | 9 +++------
 src/SConscript     | 4 +---
 src/meson.build    | 3 ---
 4 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92642d08..100dc762 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -922,10 +922,7 @@ set(SERVER_SRC
 	response.c
 	connections.c
 	h1.c
-	h2.c
 	sock_addr_cache.c
-	ls-hpack/lshpack.c
-	algo_xxhash.c
 	fdevent_impl.c
 	http_range.c
 	network.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 95d5e076..0405bef4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,12 +70,10 @@ common_src=base64.c buffer.c burl.c log.c \
 
 common_src += fdevent_win32.c fs_win32.c
 
-src = server.c response.c connections.c h1.c h2.c \
+src = server.c response.c connections.c h1.c \
 	sock_addr_cache.c \
 	network.c \
 	network_write.c \
-	ls-hpack/lshpack.c \
-	algo_xxhash.c \
 	fdevent_impl.c \
 	http_range.c \
 	data_config.c \
@@ -428,6 +426,8 @@ lighttpd_LDADD = \
   $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
 lighttpd_LDFLAGS = -export-dynamic
 
+lighttpd_SOURCES += h2.c ls-hpack/lshpack.c algo_xxhash.c
+lighttpd_LDADD += $(XXHASH_LIBS)
 if BUILD_WITH_MAXMINDDB
 lighttpd_SOURCES += mod_maxminddb.c
 lighttpd_LDADD += $(MAXMINDDB_LIB)
@@ -489,9 +489,6 @@ lighttpd_SOURCES += mod_wolfssl.c
 lighttpd_CPPFLAGS += $(WOLFSSL_CFLAGS)
 lighttpd_LDADD += $(WOLFSSL_LIBS)
 endif
-#(until switch to mod_h2)
-#lighttpd_SOURCES += h2.c ls-hpack/lshpack.c algo_xxhash.c
-#lighttpd_LDADD += $(XXHASH_LIBS)
 
 else
 
diff --git a/src/SConscript b/src/SConscript
index 4d6a3f4b..9a5d03bb 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -75,10 +75,8 @@ common_src = Split("base64.c buffer.c burl.c log.c \
 	ck.c \
 ")
 
-src = Split("server.c response.c connections.c h1.c h2.c \
+src = Split("server.c response.c connections.c h1.c \
 	sock_addr_cache.c \
-	ls-hpack/lshpack.c \
-	algo_xxhash.c \
 	fdevent_impl.c \
 	http_range.c \
 	network.c \
diff --git a/src/meson.build b/src/meson.build
index ed7a3953..ed2764bb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -560,10 +560,7 @@ main_src = files(
 	'connections.c',
 	'data_config.c',
 	'h1.c',
-	'h2.c',
 	'sock_addr_cache.c',
-	'ls-hpack/lshpack.c',
-	'algo_xxhash.c',
 	'fdevent_impl.c',
 	'http_range.c',
 	'network_write.c',
-- 
cgit v1.2.1