lighttpd
/
lighttpd1.4
2
0
Fork 0
Code Issues Releases Wiki Activity

[mod_deflate] --with-libdeflate to use libdeflate

Browse Source 
configure --with-libdeflate option to use libdeflate
(must also configure --enable-mmap for mod_deflate to use libdeflate
 on input files larger than 64kB; libdeflate not used on files <= 64kB)
master
Glenn Strauss 1 year ago
parent 46110127f7
commit d68fc6394f
8 changed files with 75 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
SConstruct
Unescape Escape View File

@ -244,6 +244,7 @@ vars.AddVariables(
BoolVariable('with_brotli', 'enable brotli compression', 'no'),
PackageVariable('with_dbi', 'enable dbi support', 'no'),
BoolVariable('with_fam', 'enable FAM/gamin support', 'no'),
BoolVariable('with_libdeflate', 'enable libdeflate compression', 'no'),
BoolVariable('with_maxminddb', 'enable MaxMind GeoIP2 support', 'no'),
BoolVariable('with_krb5', 'enable krb5 auth support', 'no'),
BoolVariable('with_ldap', 'enable ldap auth support', 'no'),
@ -332,6 +333,7 @@ if 1:
LIBCRYPT = '',
LIBCRYPTO = '',
LIBDBI = '',
LIBDEFLATE = '',
LIBDL = '',
LIBGNUTLS = '',
LIBGSSAPI_KRB5 = '',
@ -531,6 +533,14 @@ if 1:
)
autoconf.haveFunc('FAMNoExists')
if env['with_libdeflate']:
if not autoconf.CheckLibWithHeader('deflate', 'libdeflate.h', 'C'):
fail("Couldn't find libdeflate")
autoconf.env.Append(
CPPFLAGS = [ '-DHAVE_LIBDEFLATE' ],
LIBDEFLATE = 'libdeflate',
)
if env['with_maxminddb']:
if not autoconf.CheckLibWithHeader('maxminddb', 'maxminddb.h', 'C'):
fail("Couldn't find maxminddb")

30
configure.ac
Unescape Escape View File

@ -1085,6 +1085,36 @@ if test "$WITH_BROTLI" != no; then
AC_SUBST([BROTLI_LIBS])
fi
dnl libdeflate
AC_MSG_NOTICE([----------------------------------------])
AC_MSG_CHECKING([for libdeflate support])
AC_ARG_WITH([libdeflate],
[AS_HELP_STRING([--with-libdeflate],
[Enable libdeflate support for mod_deflate]
)],
[WITH_LIBDEFLATE=$withval],
[WITH_LIBDEFLATE=no]
)
AC_MSG_RESULT([$WITH_LIBDEFLATE])
if test "$WITH_LIBDEFLATE" != no; then
if test "$WITH_LIBDEFLATE" != yes; then
DEFLATE_LIBS="-L$WITH_LIBDEFLATE -ldeflate"
CPPFLAGS="$CPPFLAGS -I$WITH_LIBDEFLATE"
else
AC_CHECK_HEADERS([libdeflate.h], [],
[AC_MSG_ERROR([libdeflate header not found, install them or build without --with-libdeflate])]
)
AC_CHECK_LIB([deflate], [libdeflate_alloc_compressor],
[DEFLATE_LIBS=-ldeflate],
[AC_MSG_ERROR([libdeflate library not found, install it or build without --with-libdeflate])]
)
fi
AC_DEFINE([HAVE_LIBDEFLATE], [1], [libdeflate])
AC_SUBST([DEFLATE_LIBS])
fi
dnl Check for fam/gamin
AC_MSG_NOTICE([----------------------------------------])
AC_MSG_CHECKING([for FAM])

5
meson_options.txt
Unescape Escape View File

@ -13,6 +13,11 @@ option('with_dbi',
value: false,
description: 'with dbi-support for mod_auth mod_vhostdb_dbi [default: off]',
)
option('with_libdeflate',
type: 'boolean',
value: false,
description: 'with libdeflate-support for mod_deflate [default: off]',
)
option('with_fam',
type: 'boolean',
value: false,

14
src/CMakeLists.txt
Unescape Escape View File

@ -40,6 +40,7 @@ option(WITH_PAM "with PAM-support for mod_auth [default: off]")
option(WITH_LUA "with lua 5.1 for mod_magnet [default: off]")
# option(WITH_VALGRIND "with internal support for valgrind [default: off]")
option(WITH_FAM "fam/gamin for reducing number of stat() calls [default: off]")
option(WITH_LIBDEFLATE "with libdeflate-support for mod_deflate [default: off]")
option(WITH_LIBEV "libev support for fdevent handlers [default: off]")
option(WITH_LIBUNWIND "with libunwind to print backtraces in asserts [default: off]")
option(WITH_MAXMINDDB "with MaxMind GeoIP2-support mod_maxminddb [default: off]")
@ -774,6 +775,14 @@ else()
unset(HAVE_LIBLBER)
endif()
if(WITH_LIBDEFLATE)
check_include_files(libdeflate.h HAVE_LIBDEFLATE_H)
check_library_exists(deflate libdeflate_alloc_compressor "" HAVE_LIBDEFLATE)
else()
unset(HAVE_LIBDEFLATE_H)
unset(HAVE_LIBDEFLATE)
endif()
if(WITH_PAM)
check_include_files(security/pam_appl.h HAVE_SECURITY_PAM_APPL_H)
check_library_exists(pam pam_start "" HAVE_PAM)
@ -1085,7 +1094,7 @@ if(WITH_SASL)
target_link_libraries(mod_authn_sasl ${L_MOD_AUTHN_SASL})
endif()
if(HAVE_ZLIB_H OR HAVE_ZSTD_H OR HAVE_BZLIB_H OR HAVE_BROTLI)
if(HAVE_ZLIB_H OR HAVE_ZSTD_H OR HAVE_BZLIB_H OR HAVE_BROTLI OR HAVE_LIBDEFLATE)
if(HAVE_ZLIB_H)
set(L_MOD_DEFLATE ${L_MOD_DEFLATE} ${ZLIB_LIBRARY})
endif()
@ -1098,6 +1107,9 @@ if(HAVE_ZLIB_H OR HAVE_ZSTD_H OR HAVE_BZLIB_H OR HAVE_BROTLI)
if(HAVE_BROTLI)
set(L_MOD_DEFLATE ${L_MOD_DEFLATE} brotlienc)
endif()
if(HAVE_LIBDEFLATE)
set(L_MOD_DEFLATE ${L_MOD_DEFLATE} deflate)
endif()
target_link_libraries(mod_deflate ${L_MOD_DEFLATE})
endif()

4
src/Makefile.am
Unescape Escape View File

@ -277,7 +277,7 @@ 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)
mod_deflate_la_LIBADD = $(Z_LIB) $(ZSTD_LIB) $(BZ_LIB) $(BROTLI_LIBS) $(common_libadd)
mod_deflate_la_LIBADD = $(Z_LIB) $(ZSTD_LIB) $(BZ_LIB) $(BROTLI_LIBS) $(DEFLATE_LIBS) $(common_libadd)
lib_LTLIBRARIES += mod_auth.la
mod_auth_la_SOURCES = mod_auth.c
@ -477,7 +477,7 @@ lighttpd_LDADD = \
$(common_libadd) \
$(CRYPT_LIB) $(CRYPTO_LIB) $(XXHASH_LIBS) \
$(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIBS) $(ELFTC_LIB) \
$(PCRE_LIB) $(Z_LIB) $(ZSTD_LIB) $(BZ_LIB) $(BROTLI_LIBS) \
$(PCRE_LIB) $(Z_LIB) $(ZSTD_LIB) $(BZ_LIB) $(BROTLI_LIBS) $(DEFLATE_LIBS) \
$(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) \
$(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)
lighttpd_LDFLAGS = -export-dynamic

2
src/SConscript
Unescape Escape View File

@ -101,7 +101,7 @@ modules = {
'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'], 'm' ] },
'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_evasive' : { 'src' : [ 'mod_evasive.c' ] },
'mod_evhost' : { 'src' : [ 'mod_evhost.c' ] },

3
src/config.h.cmake
Unescape Escape View File

@ -100,6 +100,9 @@
#cmakedefine HAVE_ZSTD
#cmakedefine HAVE_ZSTD_H
/* libdeflate */
#cmakedefine HAVE_LIBDEFLATE
/* FAM */
#cmakedefine HAVE_FAM_H
#cmakedefine HAVE_FAMNOEXISTS

12
src/meson.build
Unescape Escape View File

@ -307,6 +307,16 @@ if get_option('with_fam') and not(conf_data.get('HAVE_SYS_INOTIFY_H'))
conf_data.set('HAVE_FAM_H', true)
endif
libdeflate = []
if get_option('with_libdeflate')
libdeflate = [ compiler.find_library('deflate') ]
if compiler.has_function('libdeflate_alloc_compressor', args: defs, dependencies: libdeflate, prefix: '#include <libdeflate.h>')
conf_data.set('HAVE_LIBDEFLATE', true)
else
error('Couldn\'t find libdeflate header / library')
endif
endif
libmaxminddb = []
if get_option('with_maxminddb')
libmaxminddb = [ compiler.find_library('maxminddb') ]
@ -970,7 +980,7 @@ modules = [
[ '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 ],
[ 'mod_deflate', [ 'mod_deflate.c' ], libbz2 + libz + libzstd + libbrotli + libdeflate ],
[ 'mod_dirlisting', [ 'mod_dirlisting.c' ] ],
[ 'mod_evasive', [ 'mod_evasive.c' ] ],
[ 'mod_evhost', [ 'mod_evhost.c' ] ],

Write Preview
Loading…
Cancel
Save