[Buildroot] [PATCH 1/1] package/libwebsockets: option for building with LWS_WITH_ZIP_FOPS

[Buildroot] [PATCH 1/1] package/libwebsockets: option for building with LWS_WITH_ZIP_FOPS

[Jörgen Sigvardsson]

Signed-off-by: Jörgen Sigvardsson <jorgen.sigvardsson@gmail.com>
---
 package/libwebsockets/Config.in        | 14 ++++++++++++++
 package/libwebsockets/libwebsockets.mk |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in
index d7b529cafd..8db1d8b975 100644
--- a/package/libwebsockets/Config.in
+++ b/package/libwebsockets/Config.in
@@ -9,5 +9,19 @@ config BR2_PACKAGE_LIBWEBSOCKETS
 
 	  https://libwebsockets.org/
 
+if BR2_PACKAGE_LIBWEBSOCKETS
+
+config BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS
+	bool "enable serving files from zip archives"
+	default y
+	help
+	  By enabling this flag, files can be served from a (preferably
+	  uncompressed) zip file. Furthermore, the contained files can
+	  be gzipped. Gzipped files may be delivered as-is (no deflation
+	  needed) to clients that accept gzipped encoded contents (all
+	  modern browsers do that).
+
+endif
+
 comment "libwebsockets needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index c25686d385..a62f1c70d9 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -73,4 +73,8 @@ ifeq ($(BR2_SHARED_LIBS),y)
 LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS),y)
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_ZIP_FOPS=ON
+endif
+
 $(eval $(cmake-package))
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libwebsockets: option for building with LWS_WITH_ZIP_FOPS

[Joachim Wiberg]

On Fri, Feb 11, 2022 at 09:13, Jörgen Sigvardsson <jorgen.sigvardsson@gmail.com> wrote:
> Signed-off-by: Jörgen Sigvardsson <jorgen.sigvardsson@gmail.com>

Reviewed-by: Joachim Wiberg <troglobit@gmail.com>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/libwebsockets: option for building with LWS_WITH_ZIP_FOPS

[Yann E. MORIN]

Jörgen, All,

Sorry for the later feedback.

On 2022-02-11 09:13 +0100, Jörgen Sigvardsson spake thusly:
> Signed-off-by: Jörgen Sigvardsson <jorgen.sigvardsson@gmail.com>
> ---
> +if BR2_PACKAGE_LIBWEBSOCKETS
> +
> +config BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS
> +	bool "enable serving files from zip archives"
> +	default y

Options should not default to y, unless for backward compatibility.

> +	help
> +	  By enabling this flag, files can be served from a (preferably
> +	  uncompressed) zip file. Furthermore, the contained files can
> +	  be gzipped. Gzipped files may be delivered as-is (no deflation
> +	  needed) to clients that accept gzipped encoded contents (all
> +	  modern browsers do that).

This is all a bit confusing... "Uncompressed zipfiles that can contain
gzipped files, which can be served as-is..."

Maybe just duplicate the help text of the corresponding option:

    option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" OFF)

> +ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS),y)
> +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_ZIP_FOPS=ON
> +endif

The option must be explicitly disabled:

    ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_ZIP_FOPS),y)
    LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_ZIP_FOPS=ON
    else
    LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_ZIP_FOPS=OFF
    endif

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot