[build] skip build separate modules for built-ins

skip building separate modules for built-in modules

Small modules with minimal dependencies are now built-in to lighttpd.
All 12 of these modules have a memory footprint that is approximately
the same as 1 single module built as a .dll due to mandatory minimum
binary sections and memory page sizes (4k each).

4 files changed, 0 insertions, 103 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dde5dea4..766690d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -841,9 +841,6 @@ set(COMMON_SRC
 	ck.c
 )
 
-if(LIGHTTPD_STATIC)
-  unset(BUILTIN_MODS)
-else()
   set(BUILTIN_MODS
     mod_rewrite.c
     mod_redirect.c
@@ -858,7 +855,6 @@ else()
     mod_fastcgi.c
     mod_scgi.c
   )
-endif()
 
 if(CMAKE_CROSSCOMPILING)
 	# custom compile lemon using native compiler
@@ -903,10 +899,8 @@ set(SERVER_SRC
 add_executable(lighttpd ${SERVER_SRC} ${COMMON_SRC} ${BUILTIN_MODS})
 set(L_INSTALL_TARGETS ${L_INSTALL_TARGETS} lighttpd)
 
-add_and_install_library(mod_access mod_access.c)
 add_and_install_library(mod_accesslog mod_accesslog.c)
 add_and_install_library(mod_ajp13 mod_ajp13.c)
-add_and_install_library(mod_alias mod_alias.c)
 add_and_install_library(mod_auth "mod_auth.c;mod_auth_api.c")
 add_and_install_library(mod_authn_file "mod_authn_file.c")
 if(NOT WIN32)
@@ -914,21 +908,11 @@ if(NOT WIN32)
 endif()
 add_and_install_library(mod_deflate mod_deflate.c)
 add_and_install_library(mod_dirlisting mod_dirlisting.c)
-add_and_install_library(mod_evhost mod_evhost.c)
-add_and_install_library(mod_expire mod_expire.c)
 add_and_install_library(mod_extforward mod_extforward.c)
-add_and_install_library(mod_fastcgi mod_fastcgi.c)
-add_and_install_library(mod_indexfile mod_indexfile.c)
 add_and_install_library(mod_proxy mod_proxy.c)
-add_and_install_library(mod_redirect mod_redirect.c)
-add_and_install_library(mod_rewrite mod_rewrite.c)
 add_and_install_library(mod_rrdtool mod_rrdtool.c)
-add_and_install_library(mod_scgi mod_scgi.c)
-add_and_install_library(mod_setenv mod_setenv.c)
-add_and_install_library(mod_simple_vhost mod_simple_vhost.c)
 add_and_install_library(mod_sockproxy mod_sockproxy.c)
 add_and_install_library(mod_ssi mod_ssi.c)
-add_and_install_library(mod_staticfile mod_staticfile.c)
 add_and_install_library(mod_status mod_status.c)
 add_and_install_library(mod_userdir mod_userdir.c)
 add_and_install_library(mod_vhostdb "mod_vhostdb.c;mod_vhostdb_api.c")
@@ -1133,8 +1117,6 @@ if(WIN32)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVALGRIND")
 	add_target_properties(lighttpd COMPILE_FLAGS "-DLI_DECLARE_EXPORTS")
 	target_link_libraries(mod_proxy ws2_32)
-	target_link_libraries(mod_fastcgi ws2_32)
-	target_link_libraries(mod_scgi ws2_32)
 	target_link_libraries(mod_ssi ws2_32)
 
 	if(MINGW)
diff --git a/src/Makefile.am b/src/Makefile.am
index c7e2d9c5..4678e524 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -186,36 +186,11 @@ mod_cgi_la_SOURCES = mod_cgi.c
 mod_cgi_la_LDFLAGS = $(common_module_ldflags)
 mod_cgi_la_LIBADD = $(common_libadd)
 
-lib_LTLIBRARIES += mod_scgi.la
-mod_scgi_la_SOURCES = mod_scgi.c
-mod_scgi_la_LDFLAGS = $(common_module_ldflags)
-mod_scgi_la_LIBADD = $(common_libadd)
-
-lib_LTLIBRARIES += mod_staticfile.la
-mod_staticfile_la_SOURCES = mod_staticfile.c
-mod_staticfile_la_LDFLAGS = $(common_module_ldflags)
-mod_staticfile_la_LIBADD = $(common_libadd)
-
 lib_LTLIBRARIES += mod_dirlisting.la
 mod_dirlisting_la_SOURCES = mod_dirlisting.c
 mod_dirlisting_la_LDFLAGS = $(common_module_ldflags)
 mod_dirlisting_la_LIBADD = $(common_libadd)
 
-lib_LTLIBRARIES += mod_indexfile.la
-mod_indexfile_la_SOURCES = mod_indexfile.c
-mod_indexfile_la_LDFLAGS = $(common_module_ldflags)
-mod_indexfile_la_LIBADD = $(common_libadd)
-
-lib_LTLIBRARIES += mod_setenv.la
-mod_setenv_la_SOURCES = mod_setenv.c
-mod_setenv_la_LDFLAGS = $(common_module_ldflags)
-mod_setenv_la_LIBADD = $(common_libadd)
-
-lib_LTLIBRARIES += mod_alias.la
-mod_alias_la_SOURCES = mod_alias.c
-mod_alias_la_LDFLAGS = $(common_module_ldflags)
-mod_alias_la_LIBADD = $(common_libadd)
-
 lib_LTLIBRARIES += mod_userdir.la
 mod_userdir_la_SOURCES = mod_userdir.c
 mod_userdir_la_LDFLAGS = $(common_module_ldflags)
@@ -241,41 +216,16 @@ mod_ssi_la_SOURCES = mod_ssi.c
 mod_ssi_la_LDFLAGS = $(common_module_ldflags)
 mod_ssi_la_LIBADD = $(common_libadd)
 
-lib_LTLIBRARIES += mod_expire.la
-mod_expire_la_SOURCES = mod_expire.c
-mod_expire_la_LDFLAGS = $(common_module_ldflags)
-mod_expire_la_LIBADD = $(common_libadd)
-
-lib_LTLIBRARIES += mod_evhost.la
-mod_evhost_la_SOURCES = mod_evhost.c
-mod_evhost_la_LDFLAGS = $(common_module_ldflags)
-mod_evhost_la_LIBADD = $(common_libadd)
-
-lib_LTLIBRARIES += mod_simple_vhost.la
-mod_simple_vhost_la_SOURCES = mod_simple_vhost.c
-mod_simple_vhost_la_LDFLAGS = $(common_module_ldflags)
-mod_simple_vhost_la_LIBADD = $(common_libadd)
-
 lib_LTLIBRARIES += mod_ajp13.la
 mod_ajp13_la_SOURCES = mod_ajp13.c
 mod_ajp13_la_LDFLAGS = $(common_module_ldflags)
 mod_ajp13_la_LIBADD = $(common_libadd)
 
-lib_LTLIBRARIES += mod_fastcgi.la
-mod_fastcgi_la_SOURCES = mod_fastcgi.c
-mod_fastcgi_la_LDFLAGS = $(common_module_ldflags)
-mod_fastcgi_la_LIBADD = $(common_libadd)
-
 lib_LTLIBRARIES += mod_extforward.la
 mod_extforward_la_SOURCES = mod_extforward.c
 mod_extforward_la_LDFLAGS = $(common_module_ldflags)
 mod_extforward_la_LIBADD = $(common_libadd)
 
-lib_LTLIBRARIES += mod_access.la
-mod_access_la_SOURCES = mod_access.c
-mod_access_la_LDFLAGS = $(common_module_ldflags)
-mod_access_la_LIBADD = $(common_libadd)
-
 lib_LTLIBRARIES += mod_deflate.la
 mod_deflate_la_SOURCES = mod_deflate.c
 mod_deflate_la_LDFLAGS = $(BROTLI_CFLAGS) $(common_module_ldflags)
@@ -370,17 +320,6 @@ mod_wolfssl_la_LIBADD = $(WOLFSSL_LIBS) $(common_libadd)
 mod_wolfssl_la_CPPFLAGS = $(WOLFSSL_CFLAGS)
 endif
 
-
-lib_LTLIBRARIES += mod_rewrite.la
-mod_rewrite_la_SOURCES = mod_rewrite.c
-mod_rewrite_la_LDFLAGS = $(common_module_ldflags)
-mod_rewrite_la_LIBADD = $(common_libadd)
-
-lib_LTLIBRARIES += mod_redirect.la
-mod_redirect_la_SOURCES = mod_redirect.c
-mod_redirect_la_LDFLAGS = $(common_module_ldflags)
-mod_redirect_la_LIBADD = $(common_libadd)
-
 lib_LTLIBRARIES += mod_status.la
 mod_status_la_SOURCES = mod_status.c
 mod_status_la_LDFLAGS = $(common_module_ldflags)
diff --git a/src/SConscript b/src/SConscript
index 623b237c..47d095fb 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -110,30 +110,18 @@ configparser = Lemon(env, 'configparser.y')
 
 ## the modules and how they are built
 modules = {
-	'mod_access' : { 'src' : [ 'mod_access.c' ] },
 	'mod_accesslog' : { 'src' : [ 'mod_accesslog.c' ] },
 	'mod_ajp13' : { 'src' : [ 'mod_ajp13.c' ] },
-	'mod_alias' : { 'src' : [ 'mod_alias.c' ] },
 	'mod_auth' : { 'src' : [ 'mod_auth.c', 'mod_auth_api.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
 	'mod_authn_file' : { 'src' : [ 'mod_authn_file.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBCRYPTO'] ] },
 	'mod_cgi' : { 'src' : [ 'mod_cgi.c' ] },
 	'mod_deflate' : { 'src' : [ 'mod_deflate.c' ], 'lib' : [ env['LIBZ'], env['LIBZSTD'], env['LIBBZ2'], env['LIBBROTLI'], env['LIBDEFLATE'], 'm' ] },
 	'mod_dirlisting' : { 'src' : [ 'mod_dirlisting.c' ] },
-	'mod_evhost' : { 'src' : [ 'mod_evhost.c' ] },
-	'mod_expire' : { 'src' : [ 'mod_expire.c' ] },
 	'mod_extforward' : { 'src' : [ 'mod_extforward.c' ] },
-	'mod_fastcgi' : { 'src' : [ 'mod_fastcgi.c' ] },
-	'mod_indexfile' : { 'src' : [ 'mod_indexfile.c' ] },
 	'mod_proxy' : { 'src' : [ 'mod_proxy.c' ] },
-	'mod_redirect' : { 'src' : [ 'mod_redirect.c' ] },
-	'mod_rewrite' : { 'src' : [ 'mod_rewrite.c' ] },
 	'mod_rrdtool' : { 'src' : [ 'mod_rrdtool.c' ] },
-	'mod_scgi' : { 'src' : [ 'mod_scgi.c' ] },
-	'mod_setenv' : { 'src' : [ 'mod_setenv.c' ] },
-	'mod_simple_vhost' : { 'src' : [ 'mod_simple_vhost.c' ] },
 	'mod_sockproxy' : { 'src' : [ 'mod_sockproxy.c' ] },
 	'mod_ssi' : { 'src' : [ 'mod_ssi.c' ] },
-	'mod_staticfile' : { 'src' : [ 'mod_staticfile.c' ] },
 	'mod_status' : { 'src' : [ 'mod_status.c' ] },
 	'mod_userdir' : { 'src' : [ 'mod_userdir.c' ] },
 	'mod_vhostdb' : { 'src' : [ 'mod_vhostdb.c', 'mod_vhostdb_api.c' ] },
diff --git a/src/meson.build b/src/meson.build
index ad399b11..fae883c2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -743,29 +743,17 @@ test('test_mod', executable('test_mod',
 ))
 
 modules = [
-	[ 'mod_access', [ 'mod_access.c' ] ],
 	[ 'mod_accesslog', [ 'mod_accesslog.c' ] ],
 	[ 'mod_ajp13', [ 'mod_ajp13.c' ] ],
-	[ 'mod_alias', [ 'mod_alias.c' ] ],
 	[ 'mod_auth', [ 'mod_auth.c', 'mod_auth_api.c' ], [ libcrypto ] ],
 	[ 'mod_authn_file', [ 'mod_authn_file.c' ], [ libcrypt, libcrypto ] ],
 	[ 'mod_deflate', [ 'mod_deflate.c' ], [ libbz2, libz, libzstd, libbrotli, libdeflate ] ],
 	[ 'mod_dirlisting', [ 'mod_dirlisting.c' ] ],
-	[ 'mod_evhost', [ 'mod_evhost.c' ] ],
-	[ 'mod_expire', [ 'mod_expire.c' ] ],
 	[ 'mod_extforward', [ 'mod_extforward.c' ] ],
-	[ 'mod_fastcgi', [ 'mod_fastcgi.c' ], socket_libs ],
-	[ 'mod_indexfile', [ 'mod_indexfile.c' ] ],
 	[ 'mod_proxy', [ 'mod_proxy.c' ], socket_libs ],
-	[ 'mod_redirect', [ 'mod_redirect.c' ] ],
-	[ 'mod_rewrite', [ 'mod_rewrite.c' ] ],
 	[ 'mod_rrdtool', [ 'mod_rrdtool.c' ] ],
-	[ 'mod_scgi', [ 'mod_scgi.c' ], socket_libs ],
-	[ 'mod_setenv', [ 'mod_setenv.c' ] ],
-	[ 'mod_simple_vhost', [ 'mod_simple_vhost.c' ] ],
 	[ 'mod_sockproxy', [ 'mod_sockproxy.c' ] ],
 	[ 'mod_ssi', [ 'mod_ssi.c' ], socket_libs ],
-	[ 'mod_staticfile', [ 'mod_staticfile.c' ] ],
 	[ 'mod_status', [ 'mod_status.c' ] ],
 	[ 'mod_userdir', [ 'mod_userdir.c' ] ],
 	[ 'mod_vhostdb', [ 'mod_vhostdb.c', 'mod_vhostdb_api.c' ] ],