--- a/src/main/httpserver.cpp.orig +++ b/src/main/httpserver.cpp @@ -147,7 +147,7 @@ #if defined(__FreeBSD__ ) || defined(__NetBSD__) || defined(__OpenBSD__) \ || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -#include +#include #endif #define FILEMODE 0644 --- a/src/main/lshttpdmain.cpp +++ b/src/main/lshttpdmain.cpp @@ -83,8 +83,8 @@ */ #define BUILDTIME "built: Tue Feb 8 17:55:20 UTC 2022" -static const char s_pVersionFull[] = "LiteSpeed/" PACKAGE_VERSION - " Open (" LS_MODULE_VERSION_INFO_ONELINE ") BUILD (" BUILDTIME ")"; +static const char s_pVersionFull[] = "LiteSpeed/" PACKAGE_VERSION; + static const char *getVersionFull() { return s_pVersionFull; } #define GlobalServerSessionHooks (LsiApiHooks::getServerSessionHooks()) @@ -1854,7 +1854,7 @@ #if defined(__FreeBSD__ ) || defined(__NetBSD__) || defined(__OpenBSD__) \ || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #include -#include +#include #include static long getProcessStartTime(int pid) { --- a/src/modules/lua/lsluadefs.h +++ b/src/modules/lua/lsluadefs.h @@ -22,8 +22,8 @@ extern "C" { #endif /* need lua_State * */ -#include -#include +#include +#include #ifdef __cplusplus }; #endif --- a/configure +++ b/configure @@ -16728,16 +16728,16 @@ if test "$OPENLSWS_BROTLI" = "no" ; then echo "Brotli compression disabled!!!" else - LIBBROTLI=" $OPENLSWS_BROTLI/out/libbrotlidec-static.a $OPENLSWS_BROTLI/out/libbrotlienc-static.a $OPENLSWS_BROTLI/out/libbrotlicommon-static.a " - as_ac_File=`$as_echo "ac_cv_file_$OPENLSWS_BROTLI/out/libbrotlidec-static.a" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $OPENLSWS_BROTLI/out/libbrotlidec-static.a" >&5 -$as_echo_n "checking for $OPENLSWS_BROTLI/out/libbrotlidec-static.a... " >&6; } + LIBBROTLI=" /usr/lib/libbrotlidec.so /usr/lib/libbrotlienc.so /usr/lib/libbrotlicommon.so " + as_ac_File=`$as_echo "ac_cv_file_/usr/lib/libbrotlidec.so" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/lib/libbrotlidec.so" >&5 +$as_echo_n "checking for /usr/lib/libbrotlidec.so... " >&6; } if eval \${$as_ac_File+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "$OPENLSWS_BROTLI/out/libbrotlidec-static.a"; then +if test -r "/usr/lib/libbrotlidec.so"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" @@ -16749,21 +16749,21 @@ if eval test \"x\$"$as_ac_File"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$OPENLSWS_BROTLI/out/libbrotlidec-static.a" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_/usr/lib/libbrotlidec.so" | $as_tr_cpp` 1 _ACEOF else LIBBROTLI= fi -as_ac_File=`$as_echo "ac_cv_file_$OPENLSWS_BROTLI/c/include/brotli/decode.h" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $OPENLSWS_BROTLI/c/include/brotli/decode.h" >&5 -$as_echo_n "checking for $OPENLSWS_BROTLI/c/include/brotli/decode.h... " >&6; } +as_ac_File=`$as_echo "ac_cv_file_/usr/include/brotli/decode.h" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/brotli/decode.h" >&5 +$as_echo_n "checking for /usr/include/brotli/decode.h... " >&6; } if eval \${$as_ac_File+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "$OPENLSWS_BROTLI/c/include/brotli/decode.h"; then +if test -r "/usr/include/brotli/decode.h"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" @@ -16775,7 +16775,7 @@ if eval test \"x\$"$as_ac_File"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$OPENLSWS_BROTLI/c/include/brotli/decode.h" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_/sur/include/brotli/decode.h" | $as_tr_cpp` 1 _ACEOF else @@ -16786,8 +16786,8 @@ echo "Brotli files check failed. If continue, brotli compression will be disabled." else echo "Brotli checked and enabled!!!" - CPPFLAGS="$CPPFLAGS -I$OPENLSWS_BROTLI/c/include " - LIBBROTLI=" $OPENLSWS_BROTLI/out/libbrotlidec-static.a $OPENLSWS_BROTLI/out/libbrotlienc-static.a $OPENLSWS_BROTLI/out/libbrotlicommon-static.a " + CPPFLAGS="$CPPFLAGS -I/usr/include " + LIBBROTLI=" /usr/lib/libbrotlidec.so /usr/lib/libbrotlienc.so /usr/lib/libbrotlicommon.so " cat >>confdefs.h <<_ACEOF #define USE_BROTLI 1 @@ -16884,7 +16884,7 @@ -CPPFLAGS=" -I$srcdir/ssl/include $CPPFLAGS -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg -DUSE_BORINGSSL=1 " +CPPFLAGS=" $CPPFLAGS -I../../src -I../../include -I/usr/local/include -I/usr/local -I/usr -I/usr/pkg -DUSE_BORINGSSL=1 " BSSL=`. $srcdir/dlbssl.sh "$OPENLSWS_BSSL"` echo "BoringSSL files copied to $srcdir/ssl/ from $OPENLSWS_BSSL." @@ -17246,7 +17246,7 @@ -if test "$OSNAME" = Darwin ; then +if test "$OSNAME" = Linux ; then # Check whether --with-openssl was given.