From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 02 Nov 2023 12:28:58 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qyVsg-00FGNb-7F for lore@lore.pengutronix.de; Thu, 02 Nov 2023 12:28:58 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qyVsf-0005La-8o; Thu, 02 Nov 2023 12:28:57 +0100 Received: from mail.thorsis.com ([92.198.35.195]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qyVsG-0005L1-LQ for ptxdist@pengutronix.de; Thu, 02 Nov 2023 12:28:37 +0100 Date: Thu, 2 Nov 2023 12:28:24 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=default; t=1698924509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=TJHb/ZBonJHY5HQ/iN8ekdpKutDNuCKsFe6cmPeVpas=; b=CrVu6+9v76OyeLCio7j+x+5SkRZIBZWbXrI8Ov7MAgX7oqvNqg2IfvvFETvCM84SyABU9+ DbuFuoRjAT9FeWmmdvF+fshXQzpjAAFnpnKcfS/tGgvwUllrORuZ6Uh60DZorngfH5QnZs Ck167CU8HPH5TbKKHfZFV//kRAW39HhrLd3wYSp/V9z/Uzc0GxYymPG07calpxuvj8+Yde 8pUdQFYlmx4rknB7EX09Wj0KAvqon42JnW0RIkZKHKIlFrI5J4AH734gDGVQLizH8Z2Gw7 voa/tHD5TZw0+aa6EmALpSY1PbTpZ0D5mNoQhWSN360Mdzw2PTeanVGJlWqkkw== From: Alexander Dahl To: Andreas Helmcke Message-ID: <20231102-panning-civic-148c1c730b3d@ifak-system.com> Mail-Followup-To: Andreas Helmcke , ptxdist@pengutronix.de References: <20231023122113.23521-1-ahelmcke@ela-soft.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231023122113.23521-1-ahelmcke@ela-soft.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH v4] lighttpd: Version bump, 1.4.67 -> 1.4.72 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Hello Andreas, Am Mon, Oct 23, 2023 at 02:21:13PM +0200 schrieb Andreas Helmcke: > Bugfixes and several changes. e.g. > - Stronger TLS defaults > - HTTP/2 Support now as optional module > - Some former modules are now build in > > Link: https://www.lighttpd.net/2023/1/3/1.4.68/ > Link: https://www.lighttpd.net/2023/2/10/1.4.69/ > Link: https://www.lighttpd.net/2023/5/10/1.4.70/ > Link: https://www.lighttpd.net/2023/5/27/1.4.71/ > Link: https://www.lighttpd.net/2023/10/6/1.4.72/ > Signed-off-by: Andreas Helmcke Tested-by: Alexander Dahl Can confirm the connection is using HTTP/2 or HTTP/1.1 depending on the menu option now. Looks fine. I had to adapt my lighttpd.conf for modules which where covered by @MODULES@ before. This is more a migration problem however, not directly business of this patch (never was). Thanks and greets Alex > --- > projectroot/etc/lighttpd/lighttpd.conf | 2 ++ > rules/lighttpd.in | 37 +++++++++----------------- > rules/lighttpd.make | 17 +++++------- > 3 files changed, 22 insertions(+), 34 deletions(-) > > diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf > index fa2f60e13..abd4bb66e 100644 > --- a/projectroot/etc/lighttpd/lighttpd.conf > +++ b/projectroot/etc/lighttpd/lighttpd.conf > @@ -13,6 +13,8 @@ server.modules = ( > @MODULES@ > ) > > +@NOH2@server.feature-flags += ( "server.h2proto" => "disable" ) > + > index-file.names = ( "index.html" ) > > include "conf.d/*.conf" > diff --git a/rules/lighttpd.in b/rules/lighttpd.in > index 910271087..18dd8ab4e 100644 > --- a/rules/lighttpd.in > +++ b/rules/lighttpd.in > @@ -69,13 +69,6 @@ endmenu > > menu "modules " > > -config LIGHTTPD_MOD_ACCESS > - bool > - prompt "mod_access" > - default y > - help > - Deny access to some files. > - > config LIGHTTPD_MOD_ACCESSLOG > bool > prompt "mod_accesslog" > @@ -83,12 +76,6 @@ config LIGHTTPD_MOD_ACCESSLOG > help > flexible logging of requests served > > -config LIGHTTPD_MOD_ALIAS > - bool > - prompt "mod_alias" > - help > - Specify a special document-root for a given url-subset. > - > config LIGHTTPD_MOD_AUTH > bool > prompt "mod_auth" > @@ -123,11 +110,12 @@ config LIGHTTPD_BZ2LIB > Enable bzip2 support for mod_deflate. > endif > > -config LIGHTTPD_MOD_FASTCGI > +config LIGHTTPD_MOD_DIRLISTING > bool > - prompt "mod_fastcgi" > - > -if LIGHTTPD_MOD_FASTCGI > + prompt "mod_dirlisting" > + default y > + help > + Creates an HTML page listing the contents of the target directory. > > config LIGHTTPD_MOD_FASTCGI_PHP > bool > @@ -140,7 +128,14 @@ config LIGHTTPD_MOD_FASTCGI_PHP > comment "PHP CGI SAPI must be enabled" > depends on !PHP8_SAPI_CGI > > -endif > +config LIGHTTPD_MOD_H2 > + bool > + prompt "mod_h2" > + default y > + help > + HTTP/2 support > + To use lighttpd without HTTP/2 you need to disable it in the configuration file: > + server.feature-flags += ( "server.h2proto" => "disable" ) > > config LIGHTTPD_MOD_MAGNET > bool > @@ -149,12 +144,6 @@ config LIGHTTPD_MOD_MAGNET > help > A module to control the request handling > > -config LIGHTTPD_MOD_REWRITE > - bool > - prompt "mod_rewrite" > - help > - Module for URL rewriting > - > config LIGHTTPD_MOD_WEBDAV > bool > prompt "mod_webdav" > diff --git a/rules/lighttpd.make b/rules/lighttpd.make > index 3aa54a1fb..40d59c346 100644 > --- a/rules/lighttpd.make > +++ b/rules/lighttpd.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd > # > # Paths and names > # > -LIGHTTPD_VERSION := 1.4.67 > -LIGHTTPD_MD5 := 64822c5061001673162cf9775d91a80b > +LIGHTTPD_VERSION := 1.4.72 > +LIGHTTPD_MD5 := 466f9fe131cd7d38d0fe47d2e6a2939d > LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION) > LIGHTTPD_SUFFIX := tar.xz > LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX) > @@ -93,24 +93,19 @@ $(STATEDIR)/lighttpd.install: > # ---------------------------------------------------------------------------- > > LIGHTTPD_MODULES-y := > -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS) += mod_access > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG) += mod_accesslog > -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS) += mod_alias > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_auth > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_authn_file > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE) += mod_deflate > -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI) += mod_fastcgi > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DIRLISTING) += mod_dirlisting > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2) += mod_h2 > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET) += mod_magnet > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL) += mod_openssl > -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE) += mod_rewrite > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV) += mod_webdav > LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA)) > > LIGHTTPD_MODULE_STRING := $(subst $(space),$(comma),$(addsuffix \",$(addprefix \",$(LIGHTTPD_MODULES-y)))) > > -# add modules that are always loaded > -LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting mod_staticfile $(LIGHTTPD_MODULES-y) > - > $(STATEDIR)/lighttpd.targetinstall: > @$(call targetinfo) > > @@ -127,7 +122,7 @@ $(STATEDIR)/lighttpd.targetinstall: > /usr/sbin/lighttpd-angel) > > ifdef PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES > - @$(foreach mod,$(LIGHTTPD_MODULES_INSTALL), \ > + @$(foreach mod,$(LIGHTTPD_MODULES-y), \ > $(call install_lib, lighttpd, 0, 0, 0644, lighttpd/$(mod))$(ptx/nl)) > else > # # modules > @@ -142,6 +137,8 @@ endif > @$(call install_copy, lighttpd, 0, 0, 0755, /etc/lighttpd/conf.d) > @$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \ > @MODULES@, $(LIGHTTPD_MODULE_STRING)) > + @$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \ > + @NOH2@, $(call ptx/ifdef, PTXCONF_LIGHTTPD_MOD_H2,"#",)) > @$(call install_alternative, lighttpd, 0, 0, 0644, \ > /etc/lighttpd/conf.d/mime.conf) > > -- > 2.40.1 > >