Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lighttpd for openSUSE:Factory
checked in at 2023-05-28 19:23:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lighttpd (Old)
and /work/SRC/openSUSE:Factory/.lighttpd.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lighttpd"
Sun May 28 19:23:39 2023 rev:60 rq:1089415 version:1.4.71
Changes:
--------
--- /work/SRC/openSUSE:Factory/lighttpd/lighttpd.changes 2023-05-13
17:17:51.114453830 +0200
+++ /work/SRC/openSUSE:Factory/.lighttpd.new.1533/lighttpd.changes
2023-05-28 19:23:57.261359070 +0200
@@ -1,0 +2,6 @@
+Sun May 28 05:44:18 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- update to 1.4.71:
+ * HTTP/2 support separated to mod_h2 module
+
+-------------------------------------------------------------------
Old:
----
lighttpd-1.4.70.tar.xz
lighttpd-1.4.70.tar.xz.asc
New:
----
lighttpd-1.4.71.tar.xz
lighttpd-1.4.71.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lighttpd.spec ++++++
--- /var/tmp/diff_new_pack.z8yQFx/_old 2023-05-28 19:23:57.829362450 +0200
+++ /var/tmp/diff_new_pack.z8yQFx/_new 2023-05-28 19:23:57.833362473 +0200
@@ -26,7 +26,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: lighttpd
-Version: 1.4.70
+Version: 1.4.71
Release: 0
Summary: A Secure, Fast, Compliant, and Very Flexible Web Server
License: BSD-3-Clause
++++++ lighttpd-1.4.70.tar.xz -> lighttpd-1.4.71.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/CMakeLists.txt
new/lighttpd-1.4.71/CMakeLists.txt
--- old/lighttpd-1.4.70/CMakeLists.txt 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/CMakeLists.txt 2023-05-27 21:56:16.000000000 +0200
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.7.0 FATAL_ERROR)
-project(lighttpd VERSION 1.4.70 LANGUAGES C)
+project(lighttpd VERSION 1.4.71 LANGUAGES C)
# use C11 with CMake >= 3.1
set(CMAKE_C_STANDARD 11)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/NEWS new/lighttpd-1.4.71/NEWS
--- old/lighttpd-1.4.70/NEWS 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/NEWS 2023-05-27 21:56:16.000000000 +0200
@@ -3,6 +3,25 @@
NEWS
====
+- 1.4.71 - 2023-05-27
+ * [mod_h2] HTTP/2 separate module; no longer builtin
+ * [mod_magnet] fix static build using autoconf (fixes #3203)
+ * [core] fix new use of posix_spawn with some glibc (fixes #3201)
+ * [core] _WIN32 quiet compiler warnings 32-bit build
+ * [core] check getaddrinfo EAI_ADDRFAMILY w/ glibc
+ * [core] quiet lemon.c clang C2x warnings
+ * [core] compile w/o posix_spawn() on iOS
+ * [core] fix crash due to missing initialization (fixes #3207)
+ * [core] request_init() separate static func
+ * [multiple] remove some unused/redundant includes
+ * [core] server.modules s/mod_compress/mod_deflate/
+ * [core] preproc consistency #pragma GCC diagnostic
+ * [core] update ls-hpack
+ * [core] use empty value in srvconf.config_touched
+ * [core] provide mimetype.assign default if unset
+ * [mod_vhostdb_mysql] MySQL missing mysql_get_socket (fixes #3208)
+ * [core] clarify comment
+
- 1.4.70 - 2023-05-10
* [autotools] chmod u+w configparser.c for lemon
* [build] skip build separate modules for built-ins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/SConstruct
new/lighttpd-1.4.71/SConstruct
--- old/lighttpd-1.4.70/SConstruct 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/SConstruct 2023-05-27 21:56:16.000000000 +0200
@@ -12,7 +12,7 @@
string_types = str
package = 'lighttpd'
-version = '1.4.70'
+version = '1.4.71'
underscorify_reg = re.compile('[^A-Z0-9]')
def underscorify(id):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/configure
new/lighttpd-1.4.71/configure
--- old/lighttpd-1.4.70/configure 2023-05-10 09:21:14.000000000 +0200
+++ new/lighttpd-1.4.71/configure 2023-05-27 21:56:26.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for lighttpd 1.4.70.
+# Generated by GNU Autoconf 2.71 for lighttpd 1.4.71.
#
# Report bugs to <https://redmine.lighttpd.net/projects/lighttpd/boards/2>.
#
@@ -622,8 +622,8 @@
# Identity of this package.
PACKAGE_NAME='lighttpd'
PACKAGE_TARNAME='lighttpd'
-PACKAGE_VERSION='1.4.70'
-PACKAGE_STRING='lighttpd 1.4.70'
+PACKAGE_VERSION='1.4.71'
+PACKAGE_STRING='lighttpd 1.4.71'
PACKAGE_BUGREPORT='https://redmine.lighttpd.net/projects/lighttpd/boards/2'
PACKAGE_URL='https://www.lighttpd.net/'
@@ -1527,7 +1527,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lighttpd 1.4.70 to adapt to many kinds of systems.
+\`configure' configures lighttpd 1.4.71 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1598,7 +1598,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lighttpd 1.4.70:";;
+ short | recursive ) echo "Configuration of lighttpd 1.4.71:";;
esac
cat <<\_ACEOF
@@ -1807,7 +1807,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lighttpd configure 1.4.70
+lighttpd configure 1.4.71
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2223,7 +2223,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lighttpd $as_me 1.4.70, which was
+It was created by lighttpd $as_me 1.4.71, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3575,7 +3575,7 @@
# Define the identity of the package.
PACKAGE='lighttpd'
- VERSION='1.4.70'
+ VERSION='1.4.71'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -21856,7 +21856,7 @@
fi
fi
-LIGHTTPD_VERSION_ID=0x10446
+LIGHTTPD_VERSION_ID=0x10447
printf "%s\n" "#define LIGHTTPD_VERSION_ID $LIGHTTPD_VERSION_ID" >>confdefs.h
@@ -22454,7 +22454,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lighttpd $as_me 1.4.70, which was
+This file was extended by lighttpd $as_me 1.4.71, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22523,7 +22523,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-lighttpd config.status 1.4.70
+lighttpd config.status 1.4.71
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/configure.ac
new/lighttpd-1.4.71/configure.ac
--- old/lighttpd-1.4.70/configure.ac 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/configure.ac 2023-05-27 21:56:16.000000000 +0200
@@ -14,7 +14,7 @@
dnl function call, the argument should be on different lines than the
dnl wrapping braces
AC_PREREQ([2.60])
-AC_INIT([lighttpd],[1.4.70],[https://redmine.lighttpd.net/projects/lighttpd/boards/2],[lighttpd],[https://www.lighttpd.net/])
+AC_INIT([lighttpd],[1.4.71],[https://redmine.lighttpd.net/projects/lighttpd/boards/2],[lighttpd],[https://www.lighttpd.net/])
AC_CONFIG_SRCDIR([src/server.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/meson.build
new/lighttpd-1.4.71/meson.build
--- old/lighttpd-1.4.70/meson.build 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/meson.build 2023-05-27 21:56:16.000000000 +0200
@@ -1,7 +1,7 @@
project(
'lighttpd',
'c',
- version: '1.4.70',
+ version: '1.4.71',
license: 'BSD-3-Clause',
default_options: ['c_std=c11'],
meson_version: '>=0.47.0',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/CMakeLists.txt
new/lighttpd-1.4.71/src/CMakeLists.txt
--- old/lighttpd-1.4.70/src/CMakeLists.txt 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/CMakeLists.txt 2023-05-27 21:56:16.000000000
+0200
@@ -922,10 +922,7 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/Makefile.am
new/lighttpd-1.4.71/src/Makefile.am
--- old/lighttpd-1.4.70/src/Makefile.am 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/Makefile.am 2023-05-27 21:56:16.000000000 +0200
@@ -70,12 +70,10 @@
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,13 +426,14 @@
$(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)
endif
if BUILD_WITH_LUA
-lighttpd_SOURCES += mod_magnet.c mod_magnet_cache.c
- #algo_hmac.c
+lighttpd_SOURCES += mod_magnet.c mod_magnet_cache.c algo_hmac.c
lighttpd_CPPFLAGS += $(LUA_CFLAGS)
lighttpd_LDADD += $(LUA_LIBS) -lm
endif
@@ -489,9 +488,6 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/Makefile.in
new/lighttpd-1.4.71/src/Makefile.in
--- old/lighttpd-1.4.70/src/Makefile.in 2023-05-10 09:21:16.000000000 +0200
+++ new/lighttpd-1.4.71/src/Makefile.in 2023-05-27 21:56:28.000000000 +0200
@@ -128,7 +128,7 @@
@LIGHTTPD_STATIC_FALSE@ mod_wstunnel.la
@BUILD_WITH_MAXMINDDB_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_28 =
mod_maxminddb.c
@BUILD_WITH_MAXMINDDB_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_29 =
$(MAXMINDDB_LIB)
-@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_30 = mod_magnet.c
mod_magnet_cache.c
+@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_30 = mod_magnet.c
mod_magnet_cache.c algo_hmac.c
@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_31 = $(LUA_CFLAGS)
@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_32 = $(LUA_LIBS) -lm
@BUILD_WITH_KRB5_TRUE@@LIGHTTPD_STATIC_TRUE@am__append_33 = mod_authn_gssapi.c
@@ -636,28 +636,28 @@
-o $@
@LIGHTTPD_STATIC_FALSE@am_mod_wstunnel_la_rpath = -rpath $(libdir)
am__lighttpd_SOURCES_DIST = server.c response.c connections.c h1.c \
- h2.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 configfile.c configparser.c mod_rewrite.c \
- mod_redirect.c mod_access.c mod_alias.c mod_indexfile.c \
- mod_staticfile.c mod_setenv.c mod_expire.c mod_simple_vhost.c \
- mod_evhost.c mod_fastcgi.c mod_scgi.c base64.c buffer.c burl.c \
- log.c http_header.c http_kv.c keyvalue.c chunk.c http_chunk.c \
- fdevent.c fdevent_fdnode.c gw_backend.c stat_cache.c \
- http_etag.c array.c algo_md5.c algo_sha1.c algo_splaytree.c \
- configfile-glue.c http-header-glue.c http_cgi.c http_date.c \
- plugin.c reqpool.c request.c sock_addr.c rand.c fdlog_maint.c \
- fdlog.c sys-setjmp.c ck.c fdevent_win32.c fs_win32.c \
- mod_auth_api.c mod_vhostdb_api.c mod_accesslog.c mod_ajp13.c \
- mod_auth.c mod_authn_file.c mod_cgi.c mod_deflate.c \
- mod_dirlisting.c mod_extforward.c mod_proxy.c mod_rrdtool.c \
- mod_sockproxy.c mod_ssi.c mod_status.c mod_userdir.c \
- mod_vhostdb.c mod_webdav.c mod_maxminddb.c mod_magnet.c \
- mod_magnet_cache.c mod_authn_gssapi.c mod_authn_ldap.c \
- mod_vhostdb_ldap.c mod_authn_pam.c mod_vhostdb_mysql.c \
- mod_vhostdb_pgsql.c mod_authn_dbi.c mod_vhostdb_dbi.c \
- mod_openssl.c mod_mbedtls.c mod_gnutls.c mod_nss.c \
- mod_wolfssl.c
+ sock_addr_cache.c network.c network_write.c fdevent_impl.c \
+ http_range.c data_config.c configfile.c configparser.c \
+ mod_rewrite.c mod_redirect.c mod_access.c mod_alias.c \
+ mod_indexfile.c mod_staticfile.c mod_setenv.c mod_expire.c \
+ mod_simple_vhost.c mod_evhost.c mod_fastcgi.c mod_scgi.c \
+ base64.c buffer.c burl.c log.c http_header.c http_kv.c \
+ keyvalue.c chunk.c http_chunk.c fdevent.c fdevent_fdnode.c \
+ gw_backend.c stat_cache.c http_etag.c array.c algo_md5.c \
+ algo_sha1.c algo_splaytree.c configfile-glue.c \
+ http-header-glue.c http_cgi.c http_date.c plugin.c reqpool.c \
+ request.c sock_addr.c rand.c fdlog_maint.c fdlog.c \
+ sys-setjmp.c ck.c fdevent_win32.c fs_win32.c mod_auth_api.c \
+ mod_vhostdb_api.c mod_accesslog.c mod_ajp13.c mod_auth.c \
+ mod_authn_file.c mod_cgi.c mod_deflate.c mod_dirlisting.c \
+ mod_extforward.c mod_proxy.c mod_rrdtool.c mod_sockproxy.c \
+ mod_ssi.c mod_status.c mod_userdir.c mod_vhostdb.c \
+ mod_webdav.c h2.c ls-hpack/lshpack.c algo_xxhash.c \
+ mod_maxminddb.c mod_magnet.c mod_magnet_cache.c algo_hmac.c \
+ mod_authn_gssapi.c mod_authn_ldap.c mod_vhostdb_ldap.c \
+ mod_authn_pam.c mod_vhostdb_mysql.c mod_vhostdb_pgsql.c \
+ mod_authn_dbi.c mod_vhostdb_dbi.c mod_openssl.c mod_mbedtls.c \
+ mod_gnutls.c mod_nss.c mod_wolfssl.c
am__objects_5 = lighttpd-mod_rewrite.$(OBJEXT) \
lighttpd-mod_redirect.$(OBJEXT) lighttpd-mod_access.$(OBJEXT) \
lighttpd-mod_alias.$(OBJEXT) lighttpd-mod_indexfile.$(OBJEXT) \
@@ -691,16 +691,16 @@
@NO_RDYNAMIC_FALSE@am__objects_9 = $(am__objects_8)
am__objects_10 = lighttpd-server.$(OBJEXT) lighttpd-response.$(OBJEXT) \
lighttpd-connections.$(OBJEXT) lighttpd-h1.$(OBJEXT) \
- lighttpd-h2.$(OBJEXT) lighttpd-sock_addr_cache.$(OBJEXT) \
- lighttpd-network.$(OBJEXT) lighttpd-network_write.$(OBJEXT) \
- ls-hpack/lighttpd-lshpack.$(OBJEXT) \
- lighttpd-algo_xxhash.$(OBJEXT) lighttpd-fdevent_impl.$(OBJEXT) \
- lighttpd-http_range.$(OBJEXT) lighttpd-data_config.$(OBJEXT) \
- lighttpd-configfile.$(OBJEXT) lighttpd-configparser.$(OBJEXT) \
- $(am__objects_6) $(am__objects_9)
+ lighttpd-sock_addr_cache.$(OBJEXT) lighttpd-network.$(OBJEXT) \
+ lighttpd-network_write.$(OBJEXT) \
+ lighttpd-fdevent_impl.$(OBJEXT) lighttpd-http_range.$(OBJEXT) \
+ lighttpd-data_config.$(OBJEXT) lighttpd-configfile.$(OBJEXT) \
+ lighttpd-configparser.$(OBJEXT) $(am__objects_6) \
+ $(am__objects_9)
@BUILD_WITH_MAXMINDDB_TRUE@@LIGHTTPD_STATIC_TRUE@am__objects_11 =
lighttpd-mod_maxminddb.$(OBJEXT)
@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@am__objects_12 =
lighttpd-mod_magnet.$(OBJEXT) \
-@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@
lighttpd-mod_magnet_cache.$(OBJEXT)
+@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@
lighttpd-mod_magnet_cache.$(OBJEXT) \
+@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@ lighttpd-algo_hmac.$(OBJEXT)
@BUILD_WITH_KRB5_TRUE@@LIGHTTPD_STATIC_TRUE@am__objects_13 =
lighttpd-mod_authn_gssapi.$(OBJEXT)
@BUILD_WITH_LDAP_TRUE@@LIGHTTPD_STATIC_TRUE@am__objects_14 =
lighttpd-mod_authn_ldap.$(OBJEXT) \
@BUILD_WITH_LDAP_TRUE@@LIGHTTPD_STATIC_TRUE@
lighttpd-mod_vhostdb_ldap.$(OBJEXT)
@@ -746,6 +746,9 @@
@LIGHTTPD_STATIC_TRUE@ lighttpd-mod_vhostdb.$(OBJEXT) \
@LIGHTTPD_STATIC_TRUE@ lighttpd-mod_vhostdb_api.$(OBJEXT) \
@LIGHTTPD_STATIC_TRUE@ lighttpd-mod_webdav.$(OBJEXT) \
+@LIGHTTPD_STATIC_TRUE@ lighttpd-h2.$(OBJEXT) \
+@LIGHTTPD_STATIC_TRUE@ ls-hpack/lighttpd-lshpack.$(OBJEXT) \
+@LIGHTTPD_STATIC_TRUE@ lighttpd-algo_xxhash.$(OBJEXT) \
@LIGHTTPD_STATIC_TRUE@ $(am__objects_11) $(am__objects_12) \
@LIGHTTPD_STATIC_TRUE@ $(am__objects_13) $(am__objects_14) \
@LIGHTTPD_STATIC_TRUE@ $(am__objects_15) $(am__objects_16) \
@@ -797,6 +800,7 @@
@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_1) \
@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_1) \
@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_1) \
+@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_1) \
@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_3) \
@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_4) \
@LIGHTTPD_STATIC_TRUE@ $(am__DEPENDENCIES_5) \
@@ -939,6 +943,7 @@
./$(DEPDIR)/liblightcomp_la-sock_addr.Plo \
./$(DEPDIR)/liblightcomp_la-stat_cache.Plo \
./$(DEPDIR)/liblightcomp_la-sys-setjmp.Plo \
+ ./$(DEPDIR)/lighttpd-algo_hmac.Po \
./$(DEPDIR)/lighttpd-algo_md5.Po \
./$(DEPDIR)/lighttpd-algo_sha1.Po \
./$(DEPDIR)/lighttpd-algo_splaytree.Po \
@@ -1435,10 +1440,10 @@
http-header-glue.c http_cgi.c http_date.c plugin.c reqpool.c \
request.c sock_addr.c rand.c fdlog_maint.c fdlog.c \
sys-setjmp.c ck.c fdevent_win32.c fs_win32.c $(am__append_3)
-src = server.c response.c connections.c h1.c h2.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 configfile.c \
- configparser.c $(am__append_1) $(am__append_4)
+src = server.c response.c connections.c h1.c sock_addr_cache.c \
+ network.c network_write.c fdevent_impl.c http_range.c \
+ data_config.c configfile.c configparser.c $(am__append_1) \
+ $(am__append_4)
builtin_mods = \
mod_rewrite.c \
mod_redirect.c \
@@ -1618,9 +1623,6 @@
ls-hpack/huff-tables.h \
compat/fastcgi.h
-#(until switch to mod_h2)
-#lighttpd_SOURCES += h2.c ls-hpack/lshpack.c algo_xxhash.c
-#lighttpd_LDADD += $(XXHASH_LIBS)
@LIGHTTPD_STATIC_FALSE@lighttpd_SOURCES = $(src)
@LIGHTTPD_STATIC_TRUE@lighttpd_SOURCES = $(src) mod_access.c \
@LIGHTTPD_STATIC_TRUE@ mod_accesslog.c mod_ajp13.c mod_alias.c \
@@ -1634,7 +1636,8 @@
@LIGHTTPD_STATIC_TRUE@ mod_simple_vhost.c mod_sockproxy.c \
@LIGHTTPD_STATIC_TRUE@ mod_ssi.c mod_staticfile.c mod_status.c \
@LIGHTTPD_STATIC_TRUE@ mod_userdir.c mod_vhostdb.c \
-@LIGHTTPD_STATIC_TRUE@ mod_vhostdb_api.c mod_webdav.c \
+@LIGHTTPD_STATIC_TRUE@ mod_vhostdb_api.c mod_webdav.c h2.c \
+@LIGHTTPD_STATIC_TRUE@ ls-hpack/lshpack.c algo_xxhash.c \
@LIGHTTPD_STATIC_TRUE@ $(am__append_28) $(am__append_30) \
@LIGHTTPD_STATIC_TRUE@ $(am__append_33) $(am__append_35) \
@LIGHTTPD_STATIC_TRUE@ $(am__append_37) $(am__append_39) \
@@ -1659,13 +1662,14 @@
@LIGHTTPD_STATIC_TRUE@ $(BZ_LIB) $(BROTLI_LIBS) $(DEFLATE_LIBS) \
@LIGHTTPD_STATIC_TRUE@ $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) \
@LIGHTTPD_STATIC_TRUE@ $(FAM_LIBS) $(LIBEV_LIBS) \
-@LIGHTTPD_STATIC_TRUE@ $(LIBUNWIND_LIBS) $(am__append_29) \
-@LIGHTTPD_STATIC_TRUE@ $(am__append_32) $(am__append_34) \
-@LIGHTTPD_STATIC_TRUE@ $(am__append_36) $(am__append_38) \
-@LIGHTTPD_STATIC_TRUE@ $(am__append_41) $(am__append_44) \
-@LIGHTTPD_STATIC_TRUE@ $(am__append_47) $(am__append_50) \
-@LIGHTTPD_STATIC_TRUE@ $(am__append_52) $(am__append_55) \
-@LIGHTTPD_STATIC_TRUE@ $(am__append_58) $(am__append_61)
+@LIGHTTPD_STATIC_TRUE@ $(LIBUNWIND_LIBS) $(XXHASH_LIBS) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_29) $(am__append_32) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_34) $(am__append_36) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_38) $(am__append_41) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_44) $(am__append_47) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_50) $(am__append_52) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_55) $(am__append_58) \
+@LIGHTTPD_STATIC_TRUE@ $(am__append_61)
@LIGHTTPD_STATIC_FALSE@lighttpd_LDFLAGS = -export-dynamic
@LIGHTTPD_STATIC_TRUE@lighttpd_LDFLAGS = -export-dynamic
t_test_common_SOURCES = t/test_common.c \
@@ -2063,6 +2067,7 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/liblightcomp_la-sock_addr.Plo@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/liblightcomp_la-stat_cache.Plo@am__quote@ #
am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/liblightcomp_la-sys-setjmp.Plo@am__quote@ #
am--include-marker
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/lighttpd-algo_hmac.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/lighttpd-algo_md5.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/lighttpd-algo_sha1.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/lighttpd-algo_splaytree.Po@am__quote@ #
am--include-marker
@@ -2675,20 +2680,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-h1.obj `if test -f 'h1.c'; then $(CYGPATH_W) 'h1.c'; else $(CYGPATH_W)
'$(srcdir)/h1.c'; fi`
-lighttpd-h2.o: h2.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lighttpd-h2.o -MD
-MP -MF $(DEPDIR)/lighttpd-h2.Tpo -c -o lighttpd-h2.o `test -f 'h2.c' || echo
'$(srcdir)/'`h2.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-h2.Tpo
$(DEPDIR)/lighttpd-h2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='h2.c'
object='lighttpd-h2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-h2.o `test -f 'h2.c' || echo '$(srcdir)/'`h2.c
-
-lighttpd-h2.obj: h2.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lighttpd-h2.obj -MD
-MP -MF $(DEPDIR)/lighttpd-h2.Tpo -c -o lighttpd-h2.obj `if test -f 'h2.c';
then $(CYGPATH_W) 'h2.c'; else $(CYGPATH_W) '$(srcdir)/h2.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-h2.Tpo
$(DEPDIR)/lighttpd-h2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='h2.c'
object='lighttpd-h2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-h2.obj `if test -f 'h2.c'; then $(CYGPATH_W) 'h2.c'; else $(CYGPATH_W)
'$(srcdir)/h2.c'; fi`
-
lighttpd-sock_addr_cache.o: sock_addr_cache.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-sock_addr_cache.o -MD -MP -MF $(DEPDIR)/lighttpd-sock_addr_cache.Tpo
-c -o lighttpd-sock_addr_cache.o `test -f 'sock_addr_cache.c' || echo
'$(srcdir)/'`sock_addr_cache.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/lighttpd-sock_addr_cache.Tpo $(DEPDIR)/lighttpd-sock_addr_cache.Po
@@ -2731,34 +2722,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-network_write.obj `if test -f 'network_write.c'; then $(CYGPATH_W)
'network_write.c'; else $(CYGPATH_W) '$(srcdir)/network_write.c'; fi`
-ls-hpack/lighttpd-lshpack.o: ls-hpack/lshpack.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ls-hpack/lighttpd-lshpack.o -MD -MP -MF ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo
-c -o ls-hpack/lighttpd-lshpack.o `test -f 'ls-hpack/lshpack.c' || echo
'$(srcdir)/'`ls-hpack/lshpack.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo ls-hpack/$(DEPDIR)/lighttpd-lshpack.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ls-hpack/lshpack.c'
object='ls-hpack/lighttpd-lshpack.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ls-hpack/lighttpd-lshpack.o `test -f 'ls-hpack/lshpack.c' || echo
'$(srcdir)/'`ls-hpack/lshpack.c
-
-ls-hpack/lighttpd-lshpack.obj: ls-hpack/lshpack.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ls-hpack/lighttpd-lshpack.obj -MD -MP -MF
ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo -c -o ls-hpack/lighttpd-lshpack.obj `if
test -f 'ls-hpack/lshpack.c'; then $(CYGPATH_W) 'ls-hpack/lshpack.c'; else
$(CYGPATH_W) '$(srcdir)/ls-hpack/lshpack.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo ls-hpack/$(DEPDIR)/lighttpd-lshpack.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ls-hpack/lshpack.c'
object='ls-hpack/lighttpd-lshpack.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ls-hpack/lighttpd-lshpack.obj `if test -f 'ls-hpack/lshpack.c'; then
$(CYGPATH_W) 'ls-hpack/lshpack.c'; else $(CYGPATH_W)
'$(srcdir)/ls-hpack/lshpack.c'; fi`
-
-lighttpd-algo_xxhash.o: algo_xxhash.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-algo_xxhash.o -MD -MP -MF $(DEPDIR)/lighttpd-algo_xxhash.Tpo -c -o
lighttpd-algo_xxhash.o `test -f 'algo_xxhash.c' || echo
'$(srcdir)/'`algo_xxhash.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-algo_xxhash.Tpo
$(DEPDIR)/lighttpd-algo_xxhash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='algo_xxhash.c'
object='lighttpd-algo_xxhash.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-algo_xxhash.o `test -f 'algo_xxhash.c' || echo
'$(srcdir)/'`algo_xxhash.c
-
-lighttpd-algo_xxhash.obj: algo_xxhash.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-algo_xxhash.obj -MD -MP -MF $(DEPDIR)/lighttpd-algo_xxhash.Tpo -c -o
lighttpd-algo_xxhash.obj `if test -f 'algo_xxhash.c'; then $(CYGPATH_W)
'algo_xxhash.c'; else $(CYGPATH_W) '$(srcdir)/algo_xxhash.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-algo_xxhash.Tpo
$(DEPDIR)/lighttpd-algo_xxhash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='algo_xxhash.c'
object='lighttpd-algo_xxhash.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-algo_xxhash.obj `if test -f 'algo_xxhash.c'; then $(CYGPATH_W)
'algo_xxhash.c'; else $(CYGPATH_W) '$(srcdir)/algo_xxhash.c'; fi`
-
lighttpd-fdevent_impl.o: fdevent_impl.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-fdevent_impl.o -MD -MP -MF $(DEPDIR)/lighttpd-fdevent_impl.Tpo -c -o
lighttpd-fdevent_impl.o `test -f 'fdevent_impl.c' || echo
'$(srcdir)/'`fdevent_impl.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-fdevent_impl.Tpo
$(DEPDIR)/lighttpd-fdevent_impl.Po
@@ -3711,6 +3674,48 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-mod_webdav.obj `if test -f 'mod_webdav.c'; then $(CYGPATH_W)
'mod_webdav.c'; else $(CYGPATH_W) '$(srcdir)/mod_webdav.c'; fi`
+lighttpd-h2.o: h2.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lighttpd-h2.o -MD
-MP -MF $(DEPDIR)/lighttpd-h2.Tpo -c -o lighttpd-h2.o `test -f 'h2.c' || echo
'$(srcdir)/'`h2.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-h2.Tpo
$(DEPDIR)/lighttpd-h2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='h2.c'
object='lighttpd-h2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-h2.o `test -f 'h2.c' || echo '$(srcdir)/'`h2.c
+
+lighttpd-h2.obj: h2.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lighttpd-h2.obj -MD
-MP -MF $(DEPDIR)/lighttpd-h2.Tpo -c -o lighttpd-h2.obj `if test -f 'h2.c';
then $(CYGPATH_W) 'h2.c'; else $(CYGPATH_W) '$(srcdir)/h2.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-h2.Tpo
$(DEPDIR)/lighttpd-h2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='h2.c'
object='lighttpd-h2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-h2.obj `if test -f 'h2.c'; then $(CYGPATH_W) 'h2.c'; else $(CYGPATH_W)
'$(srcdir)/h2.c'; fi`
+
+ls-hpack/lighttpd-lshpack.o: ls-hpack/lshpack.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ls-hpack/lighttpd-lshpack.o -MD -MP -MF ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo
-c -o ls-hpack/lighttpd-lshpack.o `test -f 'ls-hpack/lshpack.c' || echo
'$(srcdir)/'`ls-hpack/lshpack.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo ls-hpack/$(DEPDIR)/lighttpd-lshpack.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ls-hpack/lshpack.c'
object='ls-hpack/lighttpd-lshpack.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ls-hpack/lighttpd-lshpack.o `test -f 'ls-hpack/lshpack.c' || echo
'$(srcdir)/'`ls-hpack/lshpack.c
+
+ls-hpack/lighttpd-lshpack.obj: ls-hpack/lshpack.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
ls-hpack/lighttpd-lshpack.obj -MD -MP -MF
ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo -c -o ls-hpack/lighttpd-lshpack.obj `if
test -f 'ls-hpack/lshpack.c'; then $(CYGPATH_W) 'ls-hpack/lshpack.c'; else
$(CYGPATH_W) '$(srcdir)/ls-hpack/lshpack.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
ls-hpack/$(DEPDIR)/lighttpd-lshpack.Tpo ls-hpack/$(DEPDIR)/lighttpd-lshpack.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ls-hpack/lshpack.c'
object='ls-hpack/lighttpd-lshpack.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
ls-hpack/lighttpd-lshpack.obj `if test -f 'ls-hpack/lshpack.c'; then
$(CYGPATH_W) 'ls-hpack/lshpack.c'; else $(CYGPATH_W)
'$(srcdir)/ls-hpack/lshpack.c'; fi`
+
+lighttpd-algo_xxhash.o: algo_xxhash.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-algo_xxhash.o -MD -MP -MF $(DEPDIR)/lighttpd-algo_xxhash.Tpo -c -o
lighttpd-algo_xxhash.o `test -f 'algo_xxhash.c' || echo
'$(srcdir)/'`algo_xxhash.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-algo_xxhash.Tpo
$(DEPDIR)/lighttpd-algo_xxhash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='algo_xxhash.c'
object='lighttpd-algo_xxhash.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-algo_xxhash.o `test -f 'algo_xxhash.c' || echo
'$(srcdir)/'`algo_xxhash.c
+
+lighttpd-algo_xxhash.obj: algo_xxhash.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-algo_xxhash.obj -MD -MP -MF $(DEPDIR)/lighttpd-algo_xxhash.Tpo -c -o
lighttpd-algo_xxhash.obj `if test -f 'algo_xxhash.c'; then $(CYGPATH_W)
'algo_xxhash.c'; else $(CYGPATH_W) '$(srcdir)/algo_xxhash.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-algo_xxhash.Tpo
$(DEPDIR)/lighttpd-algo_xxhash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='algo_xxhash.c'
object='lighttpd-algo_xxhash.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-algo_xxhash.obj `if test -f 'algo_xxhash.c'; then $(CYGPATH_W)
'algo_xxhash.c'; else $(CYGPATH_W) '$(srcdir)/algo_xxhash.c'; fi`
+
lighttpd-mod_maxminddb.o: mod_maxminddb.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-mod_maxminddb.o -MD -MP -MF $(DEPDIR)/lighttpd-mod_maxminddb.Tpo -c -o
lighttpd-mod_maxminddb.o `test -f 'mod_maxminddb.c' || echo
'$(srcdir)/'`mod_maxminddb.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/lighttpd-mod_maxminddb.Tpo $(DEPDIR)/lighttpd-mod_maxminddb.Po
@@ -3753,6 +3758,20 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-mod_magnet_cache.obj `if test -f 'mod_magnet_cache.c'; then
$(CYGPATH_W) 'mod_magnet_cache.c'; else $(CYGPATH_W)
'$(srcdir)/mod_magnet_cache.c'; fi`
+lighttpd-algo_hmac.o: algo_hmac.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-algo_hmac.o -MD -MP -MF $(DEPDIR)/lighttpd-algo_hmac.Tpo -c -o
lighttpd-algo_hmac.o `test -f 'algo_hmac.c' || echo '$(srcdir)/'`algo_hmac.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-algo_hmac.Tpo
$(DEPDIR)/lighttpd-algo_hmac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='algo_hmac.c'
object='lighttpd-algo_hmac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-algo_hmac.o `test -f 'algo_hmac.c' || echo '$(srcdir)/'`algo_hmac.c
+
+lighttpd-algo_hmac.obj: algo_hmac.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-algo_hmac.obj -MD -MP -MF $(DEPDIR)/lighttpd-algo_hmac.Tpo -c -o
lighttpd-algo_hmac.obj `if test -f 'algo_hmac.c'; then $(CYGPATH_W)
'algo_hmac.c'; else $(CYGPATH_W) '$(srcdir)/algo_hmac.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lighttpd-algo_hmac.Tpo
$(DEPDIR)/lighttpd-algo_hmac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='algo_hmac.c'
object='lighttpd-algo_hmac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
lighttpd-algo_hmac.obj `if test -f 'algo_hmac.c'; then $(CYGPATH_W)
'algo_hmac.c'; else $(CYGPATH_W) '$(srcdir)/algo_hmac.c'; fi`
+
lighttpd-mod_authn_gssapi.o: mod_authn_gssapi.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lighttpd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
lighttpd-mod_authn_gssapi.o -MD -MP -MF $(DEPDIR)/lighttpd-mod_authn_gssapi.Tpo
-c -o lighttpd-mod_authn_gssapi.o `test -f 'mod_authn_gssapi.c' || echo
'$(srcdir)/'`mod_authn_gssapi.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/lighttpd-mod_authn_gssapi.Tpo $(DEPDIR)/lighttpd-mod_authn_gssapi.Po
@@ -4836,6 +4855,7 @@
-rm -f ./$(DEPDIR)/liblightcomp_la-sock_addr.Plo
-rm -f ./$(DEPDIR)/liblightcomp_la-stat_cache.Plo
-rm -f ./$(DEPDIR)/liblightcomp_la-sys-setjmp.Plo
+ -rm -f ./$(DEPDIR)/lighttpd-algo_hmac.Po
-rm -f ./$(DEPDIR)/lighttpd-algo_md5.Po
-rm -f ./$(DEPDIR)/lighttpd-algo_sha1.Po
-rm -f ./$(DEPDIR)/lighttpd-algo_splaytree.Po
@@ -5114,6 +5134,7 @@
-rm -f ./$(DEPDIR)/liblightcomp_la-sock_addr.Plo
-rm -f ./$(DEPDIR)/liblightcomp_la-stat_cache.Plo
-rm -f ./$(DEPDIR)/liblightcomp_la-sys-setjmp.Plo
+ -rm -f ./$(DEPDIR)/lighttpd-algo_hmac.Po
-rm -f ./$(DEPDIR)/lighttpd-algo_md5.Po
-rm -f ./$(DEPDIR)/lighttpd-algo_sha1.Po
-rm -f ./$(DEPDIR)/lighttpd-algo_splaytree.Po
@@ -5373,7 +5394,6 @@
$(LEMON) -q -T$(srcdir)/lempar.c $(srcdir)/configparser.y
parsers: configparser.c
-@BUILD_WITH_LUA_TRUE@@LIGHTTPD_STATIC_TRUE@ #algo_hmac.c
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/SConscript
new/lighttpd-1.4.71/src/SConscript
--- old/lighttpd-1.4.70/src/SConscript 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/SConscript 2023-05-27 21:56:16.000000000 +0200
@@ -75,10 +75,8 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/base.h
new/lighttpd-1.4.71/src/base.h
--- old/lighttpd-1.4.70/src/base.h 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/base.h 2023-05-27 21:56:16.000000000 +0200
@@ -131,7 +131,7 @@
buffer *pid_file;
array *modules;
array *config_touched;
- array empty_array;
+ array mimetypes_default;
} server_config;
typedef struct server_socket {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/burl.c
new/lighttpd-1.4.71/src/burl.c
--- old/lighttpd-1.4.70/src/burl.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/burl.c 2023-05-27 21:56:16.000000000 +0200
@@ -44,8 +44,8 @@
/* b (byte) MUST be unsigned integer type
* https://en.wikipedia.org/wiki/UTF-8
- * reject overlong encodings of 7-byte ASCII and invalid UTF-8
- * (but does not detect other overlong multi-byte encodings) */
+ * detect invalid UTF-8 byte and byte in overlong encoding of 7-bit ASCII
+ * (but does not detect other invalid/overlong multibyte encoding sequences) */
#define li_utf8_invalid_byte(b) ((b) >= 0xF5 || ((b)|0x1) == 0xC1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/configfile-glue.c
new/lighttpd-1.4.71/src/configfile-glue.c
--- old/lighttpd-1.4.70/src/configfile-glue.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/configfile-glue.c 2023-05-27 21:56:16.000000000
+0200
@@ -323,7 +323,7 @@
++matches[n];
-
array_set_key_value(touched,cpk[i].k,cpk[i].klen,CONST_STR_LEN(""));
+ array_get_buf_ptr(touched, cpk[i].k, cpk[i].klen); /*(empty
value)*/
if (cpk[i].scope == T_CONFIG_SCOPE_CONNECTION || 0 == u) continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/configfile.c
new/lighttpd-1.4.71/src/configfile.c
--- old/lighttpd-1.4.70/src/configfile.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/configfile.c 2023-05-27 21:56:16.000000000
+0200
@@ -540,53 +540,11 @@
}
static void config_deprecate_module_compress (server *srv) {
- int mod_compress_idx = -1;
- int mod_deflate_idx = -1;
+ /* replace "mod_compress" value with "mod_deflate" value */
for (uint32_t i = 0; i < srv->srvconf.modules->used; ++i) {
buffer *m = &((data_string *)srv->srvconf.modules->data[i])->value;
if (buffer_eq_slen(m, CONST_STR_LEN("mod_compress")))
- mod_compress_idx = (int)i;
- else if (buffer_eq_slen(m, CONST_STR_LEN("mod_deflate")))
- mod_deflate_idx = (int)i;
- }
- if (mod_compress_idx < 0) return;
-
- int has_compress_directive = 0;
- for (uint32_t i = 0; i < srv->config_context->used; ++i) {
- const data_config *config =
- (data_config const *)srv->config_context->data[i];
- for (uint32_t j = 0; j < config->value->used; ++j) {
- buffer *k = &config->value->data[j]->key;
- if (0 == strncmp(k->ptr, "compress.", sizeof("compress.")-1)) {
- has_compress_directive = 1;
- break;
- }
- }
- if (has_compress_directive) {
- log_error(srv->errh, __FILE__, __LINE__,
- "Warning: \"mod_compress\" is DEPRECATED and has been replaced "
- "with \"mod_deflate\". A future release of lighttpd 1.4.x will "
- "not contain mod_compress and lighttpd may fail to start up");
- break;
- }
- }
-
- if (mod_deflate_idx >= 0 || !has_compress_directive) {
- /* create new modules value list without mod_compress */
- array *a = array_init(srv->srvconf.modules->used-1);
- for (uint32_t i = 0; i < srv->srvconf.modules->used; ++i) {
- buffer *m = &((data_string *)srv->srvconf.modules->data[i])->value;
- if (buffer_eq_slen(m, CONST_STR_LEN("mod_compress")))
- continue;
- array_insert_value(a, BUF_PTR_LEN(m));
- }
- array_free(srv->srvconf.modules);
- srv->srvconf.modules = a;
- }
- else {
- /* replace "mod_compress" value with "mod_deflate" value */
- buffer *m = &((data_string
*)srv->srvconf.modules->data[mod_compress_idx])->value;
- buffer_copy_string_len(m, CONST_STR_LEN("mod_deflate"));
+ buffer_copy_string_len(m, CONST_STR_LEN("mod_deflate"));
}
}
@@ -962,13 +920,12 @@
if (config_feature_bool(srv, "server.h2proto", 1))
array_insert_value(srv->srvconf.modules, CONST_STR_LEN("mod_h2"));
+ config_deprecate_module_compress(srv);
config_check_module_duplicates(srv);
if (srv->srvconf.compat_module_load)
config_compat_module_load(srv);
- config_deprecate_module_compress(srv);
-
if (srv->srvconf.http_url_normalize)
config_burl_normalize_cond(srv);
@@ -979,6 +936,48 @@
return rc;
}
+__attribute_cold__
+static void config_mimetypes_default(array * const a) {
+ static const char * const mimetypes_default[] = {
+ ".html", "text/html"
+ ,".htm", "text/html"
+ ,".txt", "text/plain;charset=utf-8"
+ ,".text", "text/plain;charset=utf-8"
+ ,".css", "text/css;charset=utf-8"
+ ,".js", "text/javascript"
+ ,".mjs", "text/javascript"
+ ,".xml", "text/xml"
+ ,".jpg", "image/jpeg"
+ ,".jpeg", "image/jpeg"
+ ,".png", "image/png"
+ ,".gif", "image/gif"
+ ,".svg", "image/svg+xml"
+ ,".svgz", "image/svg+xml"
+ ,".json", "application/json"
+ ,".dtd", "application/xml-dtd"
+ ,".pdf", "application/pdf"
+ ,".woff", "font/woff"
+ ,".woff2", "font/woff2"
+ ,".md", "text/markdown;charset=utf-8"
+ ,".ico", "image/x-icon" /* alt: "image/vnd.microsoft.icon" */
+ ,"README", "text/plain;charset=utf-8"
+
+ #if 0
+ /* intentionally omit catch-all to signal elsewhere internally
+ * to omit sending caching headers such as ETag, Last-Modified */
+ ,"", "application/octet-stream"
+ #endif
+ };
+
+ uint32_t i = 0;
+ do {
+ array_set_key_value(a, mimetypes_default[i],
+ strlen(mimetypes_default[i]),
+ mimetypes_default[i+1],
+ strlen(mimetypes_default[i+1]));
+ } while ((i+=2) < sizeof(mimetypes_default)/sizeof(*mimetypes_default));
+}
+
static int config_insert(server *srv) {
static const config_plugin_keys_t cpk[] = {
{ CONST_STR_LEN("server.document-root"),
@@ -1235,7 +1234,7 @@
| (srv->srvconf.http_host_normalize ? HTTP_PARSEOPT_HOST_NORMALIZE :0)
| (srv->srvconf.http_method_get_body ? HTTP_PARSEOPT_METHOD_GET_BODY
:0);
p->defaults.http_parseopts |= srv->srvconf.http_url_normalize;
- p->defaults.mimetypes = &srv->srvconf.empty_array; /*(must not be NULL)*/
+ p->defaults.mimetypes = &srv->srvconf.mimetypes_default;/*must not be
NULL*/
p->defaults.h2proto = srv->srvconf.h2proto;
/* initialize p->defaults from global config context */
@@ -1245,6 +1244,9 @@
config_merge_config(&p->defaults, cpv);
}
+ if (p->defaults.mimetypes == &srv->srvconf.mimetypes_default)
+ config_mimetypes_default(&srv->srvconf.mimetypes_default);
+
/* (after processing config defaults) */
p->defaults.max_request_field_size = srv->srvconf.max_request_field_size;
p->defaults.log_request_header_on_error =
@@ -1567,6 +1569,7 @@
array_free(srv->srvconf.config_touched);
array_free(srv->srvconf.modules);
array_free(srv->srvconf.upload_tempdirs);
+ array_free_data(&srv->srvconf.mimetypes_default);
#ifdef HAVE_PCRE2_H
if (NULL == srv->match_data) pcre2_match_data_free(srv->match_data);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/fdevent.c
new/lighttpd-1.4.71/src/fdevent.c
--- old/lighttpd-1.4.70/src/fdevent.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/fdevent.c 2023-05-27 21:56:16.000000000 +0200
@@ -430,6 +430,15 @@
}
+/* iOS does not allow subprocess creation; avoid compiling advanced
interfaces*/
+#if defined(__APPLE__) && defined(__MACH__)
+#include <TargetConditionals.h> /* TARGET_OS_IPHONE, TARGET_OS_MAC */
+#if TARGET_OS_IPHONE /* iOS, tvOS, or watchOS device */
+#undef HAVE_POSIX_SPAWN
+#endif
+#endif
+
+
#include <stdio.h> /* perror() rename() */
#include <signal.h> /* signal() kill() */
#ifdef HAVE_POSIX_SPAWN
@@ -442,6 +451,7 @@
}
+#ifdef HAVE_POSIX_SPAWN
#if !defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP) \
&& defined(POSIX_SPAWN_CLOEXEC_DEFAULT) /* Mac OS */
__attribute_noinline__
@@ -458,6 +468,7 @@
return rc;
}
#endif
+#endif
pid_t fdevent_fork_execve(const char *name, char *argv[], char *envp[], int
fdin, int fdout, int fderr, int dfd) {
@@ -516,12 +527,12 @@
#endif
&& 0 == (rc = sigemptyset(&sigs))
&& 0 == (rc = posix_spawnattr_setsigmask(&attr, &sigs))
- #ifdef __linux__
- /* linux appears to walk all signals and to query and preserve some
+ #if defined(__GLIBC__) \
+ && (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 24 && __GLIBC_MINOR__ <= 37)
+ /* glibc appears to walk all signals and to query and preserve some
* sigaction flags even if setting to SIG_DFL, though if specified
* in posix_spawnattr_setsigdefault(), resets to SIG_DFL without query.
- * Therefore, resetting all signals results in about 1/2 the syscalls.
- * (FreeBSD appears more efficient. Unverified on other platforms.) */
+ * Therefore, resetting all signals results in about 1/2 the
syscalls.*/
&& 0 == (rc = sigfillset(&sigs))
#else
/*(force reset signals to SIG_DFL if server.c set to SIG_IGN)*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/fdevent_impl.h
new/lighttpd-1.4.71/src/fdevent_impl.h
--- old/lighttpd-1.4.70/src/fdevent_impl.h 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/fdevent_impl.h 2023-05-27 21:56:16.000000000
+0200
@@ -54,7 +54,6 @@
#endif
#include "base_decls.h"
-#include "fdevent.h" /* (*fdevent_handler) */
typedef enum {
FDEVENT_HANDLER_UNSET,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/fdevent_win32.c
new/lighttpd-1.4.71/src/fdevent_win32.c
--- old/lighttpd-1.4.70/src/fdevent_win32.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/fdevent_win32.c 2023-05-27 21:56:16.000000000
+0200
@@ -242,14 +242,14 @@
int fdevent_socket_set_cloexec (int fd)
{
- return SetHandleInformation((HANDLE)(uint64_t)fd,
+ return SetHandleInformation((HANDLE)(uintptr_t)fd,
HANDLE_FLAG_INHERIT, 0) ? 0 : -1;
}
int fdevent_socket_clr_cloexec (int fd)
{
- return SetHandleInformation((HANDLE)(uint64_t)fd,
+ return SetHandleInformation((HANDLE)(uintptr_t)fd,
HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT)
? 0
: -1;
@@ -265,7 +265,7 @@
int fdevent_socket_set_nb_cloexec (int fd)
{
- return SetHandleInformation((HANDLE)(uint64_t)fd, HANDLE_FLAG_INHERIT, 0)
+ return SetHandleInformation((HANDLE)(uintptr_t)fd, HANDLE_FLAG_INHERIT, 0)
? fdevent_socket_set_nb(fd)
: -1;
}
@@ -645,7 +645,7 @@
* Programmatically controlling which handles are inherited by new
processes
* in Win32: https://devblogs.microsoft.com/oldnewthing/20111216-00/?p=8873
*/
- size_t sz = 0;
+ SIZE_T sz = 0;
InitializeProcThreadAttributeList(NULL, 1, 0, &sz);
/* GetLastError() == ERROR_INSUFFICIENT_BUFFER */
LPPROC_THREAD_ATTRIBUTE_LIST attrlist = info.lpAttributeList = malloc(sz);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/http_chunk.c
new/lighttpd-1.4.71/src/http_chunk.c
--- old/lighttpd-1.4.70/src/http_chunk.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/http_chunk.c 2023-05-27 21:56:16.000000000
+0200
@@ -10,16 +10,11 @@
#include "http_chunk.h"
#include "chunk.h"
#include "stat_cache.h"
-#include "fdevent.h"
#include "log.h"
#include "request.h"
-#include <sys/types.h>
-#include <sys/stat.h>
#include "sys-unistd.h" /* <unistd.h> */
-#include <errno.h>
-#include <stdlib.h>
#include <string.h>
__attribute_noinline__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/lemon.c
new/lighttpd-1.4.71/src/lemon.c
--- old/lighttpd-1.4.70/src/lemon.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/lemon.c 2023-05-27 21:56:16.000000000 +0200
@@ -52,7 +52,7 @@
#define MAXRHS 1000
#endif
-extern void memory_error();
+extern void memory_error(void);
static int showPrecedenceConflict = 0;
static char *msort(char*,char**,int(*)(const char*,const char*));
@@ -202,7 +202,7 @@
enum option_type type;
const char *label;
char *arg;
- void(*fn)();
+ void(*fn)(char *);
const char *message;
};
int OptInit(char**,struct s_options*,FILE*);
@@ -435,7 +435,7 @@
};
#define MemoryCheck(X) if((X)==0){ \
- extern void memory_error(); \
+ extern void memory_error(void); \
memory_error(); \
}
@@ -1999,7 +1999,7 @@
}else if( op[j].type==OPT_FLAG ){
*((int*)op[j].arg) = v;
}else if( op[j].type==OPT_FFLAG ){
- op[j].fn(v);
+ ((void(*)(int))op[j].fn)(v);
}else if( op[j].type==OPT_FSTR ){
op[j].fn(&g_argv[i][2]);
}else{
@@ -2083,13 +2083,13 @@
*(double*)(op[j].arg) = dv;
break;
case OPT_FDBL:
- op[j].fn(dv);
+ ((void(*)(double))op[j].fn)(dv);
break;
case OPT_INT:
*(int*)(op[j].arg) = lv;
break;
case OPT_FINT:
- op[j].fn((int)lv);
+ ((void(*)(int))op[j].fn)((int)lv);
break;
case OPT_STR:
*(char**)(op[j].arg) = sv;
@@ -5560,7 +5560,7 @@
}
/* Return the size of the array */
-int Symbol_count()
+int Symbol_count(void)
{
return x2a ? x2a->count : 0;
}
@@ -5568,7 +5568,7 @@
/* Return an array of pointers to all data in the table.
** The array is obtained from malloc. Return NULL if memory allocation
** problems, or if the array is empty. */
-struct symbol **Symbol_arrayof()
+struct symbol **Symbol_arrayof(void)
{
struct symbol **array;
int i,arrSize;
@@ -5619,7 +5619,7 @@
}
/* Allocate a new state structure */
-struct state *State_new()
+struct state *State_new(void)
{
struct state *newstate;
newstate = (struct state *)calloc(1, sizeof(struct state) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/ls-hpack/lshpack.c
new/lighttpd-1.4.71/src/ls-hpack/lshpack.c
--- old/lighttpd-1.4.70/src/ls-hpack/lshpack.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/ls-hpack/lshpack.c 2023-05-27 21:56:16.000000000
+0200
@@ -704,7 +704,7 @@
uintptr_t bits; /* OK not to initialize this variable */
unsigned bits_used = 0, adj;
struct encode_el cur_enc_code;
-#if __GNUC__ && __GNUC__ >= 5 && !defined(__COVERITY__)
+#if __GNUC__ && (__clang__ || __GNUC__ >= 5) && !defined(__COVERITY__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#pragma GCC diagnostic ignored "-Wuninitialized"
@@ -821,7 +821,7 @@
return p_dst - dst;
else
return -1;
-#if __GNUC__ && __GNUC__ >= 5 && !defined(__COVERITY__)
+#if __GNUC__ && (__clang__ || __GNUC__ >= 5) && !defined(__COVERITY__)
#pragma GCC diagnostic pop
#endif
}
@@ -1877,7 +1877,7 @@
uint16_t idx;
int r;
-#if __GNUC__ && __GNUC__ >= 5 && !defined(__COVERITY__)
+#if __GNUC__ && (__clang__ || __GNUC__ >= 5) && !defined(__COVERITY__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#pragma GCC diagnostic ignored "-Wuninitialized"
@@ -2042,7 +2042,7 @@
if (((1u << avail_bits) - 1) != (buf & ((1u << avail_bits) - 1)))
return -1; /* Not EOF as expected */
}
-#if __GNUC__ && __GNUC__ >= 5 && !defined(__COVERITY__)
+#if __GNUC__ && (__clang__ || __GNUC__ >= 5) && !defined(__COVERITY__)
#pragma GCC diagnostic pop
#endif
@@ -2062,6 +2062,6 @@
return r;
}
#endif
-#if __GNUC__ && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+#if __GNUC__ && (__clang__ || __GNUC__ >= 5) && !defined(__COVERITY__)
#pragma GCC diagnostic pop /* -Wunknown-pragmas */
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/ls-hpack/lsxpack_header.h
new/lighttpd-1.4.71/src/ls-hpack/lsxpack_header.h
--- old/lighttpd-1.4.70/src/ls-hpack/lsxpack_header.h 2023-05-10
09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/ls-hpack/lsxpack_header.h 2023-05-27
21:56:16.000000000 +0200
@@ -1,5 +1,5 @@
-#ifndef LSXPACK_HEADER_H_v207
-#define LSXPACK_HEADER_H_v207
+#ifndef LSXPACK_HEADER_H_v208
+#define LSXPACK_HEADER_H_v208
#ifdef __cplusplus
extern "C" {
@@ -13,6 +13,7 @@
#define LSXPACK_MAX_STRLEN UINT16_MAX
#endif
+typedef int32_t lsxpack_offset_t;
#if LSXPACK_MAX_STRLEN == UINT16_MAX
typedef uint16_t lsxpack_strlen_t;
#elif LSXPACK_MAX_STRLEN == UINT32_MAX
@@ -48,9 +49,9 @@
char *buf; /* the buffer for headers */
uint32_t name_hash; /* hash value for name */
uint32_t nameval_hash; /* hash value for name + value */
- lsxpack_strlen_t name_offset; /* the offset for name in the buffer */
+ lsxpack_offset_t name_offset; /* the offset for name in the buffer */
+ lsxpack_offset_t val_offset; /* the offset for value in the buffer */
lsxpack_strlen_t name_len; /* the length of name */
- lsxpack_strlen_t val_offset; /* the offset for value in the buffer */
lsxpack_strlen_t val_len; /* the length of value */
uint16_t chain_next_idx; /* mainly for cookie value chain */
uint8_t hpack_index; /* HPACK static table index */
@@ -98,11 +99,11 @@
{
memset(hdr, 0, sizeof(*hdr));
hdr->buf = (char *)buf;
- hdr->name_offset = (lsxpack_strlen_t)name_offset;
+ hdr->name_offset = (lsxpack_offset_t)name_offset;
assert(name_len <= LSXPACK_MAX_STRLEN);
hdr->name_len = (lsxpack_strlen_t)name_len;
assert(name_offset + name_len + 2 <= LSXPACK_MAX_STRLEN);
- hdr->val_offset = (lsxpack_strlen_t)(name_offset + name_len + 2);
+ hdr->val_offset = (lsxpack_offset_t)(name_offset + name_len + 2);
assert(val_len <= LSXPACK_MAX_STRLEN);
hdr->val_len = (lsxpack_strlen_t)val_len;
}
@@ -115,11 +116,11 @@
{
memset(hdr, 0, sizeof(*hdr));
hdr->buf = (char *)buf;
- hdr->name_offset = (lsxpack_strlen_t)name_offset;
+ hdr->name_offset = (lsxpack_offset_t)name_offset;
assert(name_len <= LSXPACK_MAX_STRLEN);
hdr->name_len = (lsxpack_strlen_t)name_len;
assert(val_offset <= LSXPACK_MAX_STRLEN);
- hdr->val_offset = (lsxpack_strlen_t)val_offset;
+ hdr->val_offset = (lsxpack_offset_t)val_offset;
assert(val_len <= LSXPACK_MAX_STRLEN);
hdr->val_len = (lsxpack_strlen_t)val_len;
}
@@ -132,7 +133,7 @@
memset(hdr, 0, sizeof(*hdr));
hdr->buf = out;
assert(offset <= LSXPACK_MAX_STRLEN);
- hdr->name_offset = (lsxpack_strlen_t)offset;
+ hdr->name_offset = (lsxpack_offset_t)offset;
if (len > LSXPACK_MAX_STRLEN)
hdr->val_len = LSXPACK_MAX_STRLEN;
else
@@ -165,4 +166,4 @@
}
#endif
-#endif //LSXPACK_HEADER_H_v207
+#endif //LSXPACK_HEADER_H_v208
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/meson.build
new/lighttpd-1.4.71/src/meson.build
--- old/lighttpd-1.4.70/src/meson.build 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/meson.build 2023-05-27 21:56:16.000000000 +0200
@@ -560,10 +560,7 @@
'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',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/mod_vhostdb_mysql.c
new/lighttpd-1.4.71/src/mod_vhostdb_mysql.c
--- old/lighttpd-1.4.70/src/mod_vhostdb_mysql.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/mod_vhostdb_mysql.c 2023-05-27 21:56:16.000000000
+0200
@@ -114,7 +114,11 @@
return -1;
}
+ #ifdef LIBMARIADB
my_socket sfd = mysql_get_socket(dbconn);
+ #else
+ my_socket sfd = dbconn->net.fd;
+ #endif
(void)fdevent_socket_set_cloexec(sfd);
dbconf = (vhostdb_config *)ck_calloc(1, sizeof(*dbconf));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/mod_wstunnel.c
new/lighttpd-1.4.71/src/mod_wstunnel.c
--- old/lighttpd-1.4.70/src/mod_wstunnel.c 2023-05-10 09:20:55.000000000
+0200
+++ new/lighttpd-1.4.71/src/mod_wstunnel.c 2023-05-27 21:56:16.000000000
+0200
@@ -87,7 +87,6 @@
#include "array.h"
#include "buffer.h"
#include "chunk.h"
-#include "fdevent.h"
#include "http_header.h"
#include "log.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/plugin.c
new/lighttpd-1.4.71/src/plugin.c
--- old/lighttpd-1.4.70/src/plugin.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/plugin.c 2023-05-27 21:56:16.000000000 +0200
@@ -152,7 +152,11 @@
srv->srvconf.modules->used, sizeof(plugin *));
buffer * const tb = srv->tmp_buf;
+ #ifdef _WIN32
+ int (WINAPI *init)(plugin *pl);
+ #else
int (*init)(plugin *pl);
+ #endif
for (uint32_t i = 0; i < srv->srvconf.modules->used; ++i) {
const buffer * const module = &((data_string
*)srv->srvconf.modules->data[i])->value;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/reqpool.c
new/lighttpd-1.4.71/src/reqpool.c
--- old/lighttpd-1.4.70/src/reqpool.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/reqpool.c 2023-05-27 21:56:16.000000000 +0200
@@ -77,6 +77,17 @@
}
+__attribute_cold__
+__attribute_noinline__
+static request_st *
+request_init (connection * const con)
+{
+ request_st * const r = ck_calloc(1, sizeof(request_st));
+ request_init_data(r, con, con->srv);
+ return r;
+}
+
+
void
request_reset (request_st * const r)
{
@@ -300,11 +311,12 @@
reqpool = (request_st *)r->con; /*(reuse r->con as next ptr)*/
}
else {
- r = ck_calloc(1, sizeof(request_st));
- request_init_data(r, con, con->srv);
+ return request_init(con);
}
r->con = con;
- r->tmp_buf = con->srv->tmp_buf;
+ r->dst_addr = &con->dst_addr;
+ r->dst_addr_buf = &con->dst_addr_buf;
+ /*r->tmp_buf = con->srv->tmp_buf;*/
return r;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/request.c
new/lighttpd-1.4.71/src/request.c
--- old/lighttpd-1.4.70/src/request.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/request.c 2023-05-27 21:56:16.000000000 +0200
@@ -208,7 +208,7 @@
if (colon[1] != '\0') {
char *e;
port = strtol(colon+1, &e, 0); /*(allow decimal, octal, hex)*/
- if (0 < port && port <= USHRT_MAX && *e == '\0') {
+ if (0 < port && port <= (long)USHRT_MAX && *e == '\0') {
/* valid port */
} else {
return -1;
@@ -250,7 +250,7 @@
if (bracket[2] != '\0') { /*(ignore stray colon at string end)*/
char *e;
port = strtol(bracket+2, &e, 0); /*(allow decimal, octal,
hex)*/
- if (0 < port && port <= USHRT_MAX && *e == '\0') {
+ if (0 < port && port <= (long)USHRT_MAX && *e == '\0') {
/* valid port */
} else {
return -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/sock_addr.c
new/lighttpd-1.4.71/src/sock_addr.c
--- old/lighttpd-1.4.70/src/sock_addr.c 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/sock_addr.c 2023-05-27 21:56:16.000000000 +0200
@@ -496,7 +496,7 @@
if (0 != (rc = getaddrinfo(str, NULL, &hints, &res))) {
hints.ai_family = AF_INET;
if (
- #ifdef EAI_ADDRFAMILY
+ #if defined(__GLIBC__) && defined(EAI_ADDRFAMILY)
EAI_ADDRFAMILY == rc &&
#endif
0 == getaddrinfo(str, NULL, &hints, &res)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/sys-mmap.h
new/lighttpd-1.4.71/src/sys-mmap.h
--- old/lighttpd-1.4.70/src/sys-mmap.h 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/sys-mmap.h 2023-05-27 21:56:16.000000000 +0200
@@ -40,13 +40,21 @@
HANDLE mh = CreateFileMapping((HANDLE) _get_osfhandle(fd),
NULL, PAGE_READONLY,
+ #ifdef _WIN64
(sizeof(size_t) > 4) ? length >> 32 : 0,
+ #else
+ 0,
+ #endif
length & 0xffffffff, NULL);
if (NULL == mh)
return MAP_FAILED;
LPVOID p = MapViewOfFileEx(mh, FILE_MAP_READ,
+ #ifdef _WIN64
(sizeof(off_t) > 4) ? offset >> 32 : 0,
+ #else
+ 0,
+ #endif
offset & 0xffffffff, length, addr);
CloseHandle(mh);
return (NULL != p) ? (void *)p : MAP_FAILED;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lighttpd-1.4.70/src/sys-time.h
new/lighttpd-1.4.71/src/sys-time.h
--- old/lighttpd-1.4.70/src/sys-time.h 2023-05-10 09:20:55.000000000 +0200
+++ new/lighttpd-1.4.71/src/sys-time.h 2023-05-27 21:56:16.000000000 +0200
@@ -125,8 +125,7 @@
* Thu, 01 Jan 1970 00:00:00 GMT)
*(returning NULL not expected by lighttpd and might crash)*/
tt = 0;
- gmtime_r(&tt, result);
- return result;
+ return gmtime_r(&tt, result);
}
}
@@ -161,8 +160,7 @@
* Thu, 01 Jan 1970 00:00:00 GMT)
*(returning NULL not expected by lighttpd and might crash)*/
tt = 0;
- localtime_r(&tt, result);
- return result;
+ return localtime_r(&tt, result);
}
}
