Am 20.10.23 um 09:54 schrieb Michael Olbrich:
On Thu, Oct 19, 2023 at 01:11:51PM +0200, Andreas Helmcke wrote:
Am 19.10.23 um 11:16 schrieb Alexander Dahl:
got it sorted out, although the experience in #lighttpd IRC channel
was not as friendly as I hoped for.  See below.

Am Thu, Oct 19, 2023 at 10:33:47AM +0200 schrieb Alexander Dahl:
sorry to bother you again. :-/

I just tested v3 of your patch on my target.  See below.

Am Wed, Oct 18, 2023 at 06:00:14PM +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 <[email protected]>
---
  rules/lighttpd.in   | 35 +++++++++++------------------------
  rules/lighttpd.make | 15 +++++----------
  2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 910271087..670a00d15 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,12 @@ 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

I fear we can not make this an option (yet).

If you do not load 'mod_h2', you need an additional setting in
lighttpd.conf to make lighttpd happy.  Maybe we could add that in the
help text?  Or in the commit message?  It is this one:

     server.feature-flags += ( "server.h2proto" => "disable" )


Maybe like this?

        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" )

[...]
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2)                    += mod_h2

We probably need to always install mod_h2.  I turned the option off
and now I get this at runtime
(`lighttpd -tt -f /etc/lighttpd/lighttpd.conf`):

     2012-01-01 00:46:15: (plugin.c.209) dlopen() failed for: 
/usr/lib/lighttpd/mod_h2.so /usr/lib/lighttpd/mod_h2.so: cannot open shared 
object file: No such file or directory

You get this message if you don't have "mod_h2" in server.modules in
lighttpd.conf.  You need to set the line from above.  There's a
default configuration file 'projectroot/etc/lighttpd/lighttpd.conf' in
ptxdist.  Maybe with some magic like this:

     server.feature-flags += ( "server.h2proto" => "@H2ENDIS@" )

And then replacing the placeholder with either 'enable' or 'disable'?

I go with this magic:

  @[email protected] += ( "server.h2proto" => "disable" )

replacing @NOH2@ with either "" or "#"

This way it would be clear, that the default is to use HTTP/2 and the line could be omitted if HTTP/2 is used.

This only helps if you also use the default configuration.
I would therefore leave it at the help text.

Please add both. The default config should work without manual
modifications.

Ok.

Andreas

Reply via email to