net/lighttpd/patches/030-mod_h2-HTTP-2-separate-mod.patch

   1 From 2892a7bf3f8ce92f41134fab25fbc2057f4a36bf Mon Sep 17 00:00:00 2001
   2 From: Glenn Strauss <gstrauss@gluelogic.com>
   3 Date: Wed, 10 May 2023 19:06:42 -0400
   4 Subject: [PATCH] [mod_h2] HTTP/2 separate module; no longer builtin
   5
   6 ---
   7  src/CMakeLists.txt | 3 ---
   8  src/Makefile.am    | 9 +++------
   9  src/SConscript     | 4 +---
  10  src/meson.build    | 3 ---
  11  4 files changed, 4 insertions(+), 15 deletions(-)
  12
  13 --- a/src/CMakeLists.txt
  14 +++ b/src/CMakeLists.txt
  15 @@ -922,10 +922,7 @@ set(SERVER_SRC
  16         response.c
  17         connections.c
  18         h1.c
  19 -       h2.c
  20         sock_addr_cache.c
  21 -       ls-hpack/lshpack.c
  22 -       algo_xxhash.c
  23         fdevent_impl.c
  24         http_range.c
  25         network.c
  26 --- a/src/Makefile.am
  27 +++ b/src/Makefile.am
  28 @@ -70,12 +70,10 @@ common_src=base64.c buffer.c burl.c log.
  29
  30  common_src += fdevent_win32.c fs_win32.c
  31
  32 -src = server.c response.c connections.c h1.c h2.c \
  33 +src = server.c response.c connections.c h1.c \
  34         sock_addr_cache.c \
  35         network.c \
  36         network_write.c \
  37 -       ls-hpack/lshpack.c \
  38 -       algo_xxhash.c \
  39         fdevent_impl.c \
  40         http_range.c \
  41         data_config.c \
  42 @@ -428,6 +426,8 @@ lighttpd_LDADD = \
  43    $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
  44  lighttpd_LDFLAGS = -export-dynamic
  45
  46 +lighttpd_SOURCES += h2.c ls-hpack/lshpack.c algo_xxhash.c
  47 +lighttpd_LDADD += $(XXHASH_LIBS)
  48  if BUILD_WITH_MAXMINDDB
  49  lighttpd_SOURCES += mod_maxminddb.c
  50  lighttpd_LDADD += $(MAXMINDDB_LIB)
  51 @@ -489,9 +489,6 @@ lighttpd_SOURCES += mod_wolfssl.c
  52  lighttpd_CPPFLAGS += $(WOLFSSL_CFLAGS)
  53  lighttpd_LDADD += $(WOLFSSL_LIBS)
  54  endif
  55 -#(until switch to mod_h2)
  56 -#lighttpd_SOURCES += h2.c ls-hpack/lshpack.c algo_xxhash.c
  57 -#lighttpd_LDADD += $(XXHASH_LIBS)
  58
  59  else
  60
  61 --- a/src/SConscript
  62 +++ b/src/SConscript
  63 @@ -75,10 +75,8 @@ common_src = Split("base64.c buffer.c bu
  64         ck.c \
  65  ")
  66
  67 -src = Split("server.c response.c connections.c h1.c h2.c \
  68 +src = Split("server.c response.c connections.c h1.c \
  69         sock_addr_cache.c \
  70 -       ls-hpack/lshpack.c \
  71 -       algo_xxhash.c \
  72         fdevent_impl.c \
  73         http_range.c \
  74         network.c \
  75 --- a/src/meson.build
  76 +++ b/src/meson.build
  77 @@ -560,10 +560,7 @@ main_src = files(
  78         'connections.c',
  79         'data_config.c',
  80         'h1.c',
  81 -       'h2.c',
  82         'sock_addr_cache.c',
  83 -       'ls-hpack/lshpack.c',
  84 -       'algo_xxhash.c',
  85         'fdevent_impl.c',
  86         'http_range.c',
  87         'network_write.c',