[ptxdist] [PATCH] nginx: Allow ngx_http_charset_module to be built

[ptxdist] [PATCH] nginx: Allow ngx_http_charset_module to be built

[Ian Abbott]

Add a configuration option to build the http charset module. It allows a
charset to be specified in the HTTP "Content-Type" header, for example
for setting the charset to "utf-8".

It can also do charset conversions with some limitations, but the
nginx.make file has not been modified to install any of the supplied
conversion tables.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 rules/nginx.in   | 8 ++++++++
 rules/nginx.make | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/nginx.in b/rules/nginx.in
index ca043460c..6ee8a2ec1 100644
--- a/rules/nginx.in
+++ b/rules/nginx.in
@@ -41,6 +41,14 @@ config NGINX_HTTP_AUTOINDEX_MODULE
 	  ngx_http_autoindex_module processes requests ending with the
 	  slash character and produces a directory listing.
 
+config NGINX_HTTP_CHARSET_MODULE
+	bool
+	prompt "ngx_http_charset_module"
+	help
+	  ngx_http_charset_module adds a charset to the "Content-Type"
+	  response header field. The module can convert data from one
+	  charset to another with some limitations.
+
 config NGINX_HTTP_FASTCGI_MODULE
 	bool
 	prompt "ngx_http_fastcgi_module"
diff --git a/rules/nginx.make b/rules/nginx.make
index 5b5669de0..85df855e1 100644
--- a/rules/nginx.make
+++ b/rules/nginx.make
@@ -68,7 +68,7 @@ NGINX_CONF_OPT := \
 	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_V2_MODULE,--with-http_v2_module) \
 	--with-http_sub_module \
 	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_GZIP_STATIC_MODULE,--with-http_gzip_static_module) \
-	--without-http_charset_module \
+	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_CHARSET_MODULE,,--without-http_charset_module) \
 	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_GZIP_MODULE,,--without-http_gzip_module) \
 	--without-http_ssi_module \
 	--without-http_userid_module \
-- 
2.43.0

Re: [ptxdist] [APPLIED] nginx: Allow ngx_http_charset_module to be built

[Michael Olbrich]

Thanks, applied as 0d9b9bf68cdec06c8b93dfbc517e2bcd35291454.

Michael

[sent from post-receive hook]

On Thu, 12 Sep 2024 14:11:58 +0200, Ian Abbott <abbotti@mev.co.uk> wrote:
> Add a configuration option to build the http charset module. It allows a
> charset to be specified in the HTTP "Content-Type" header, for example
> for setting the charset to "utf-8".
> 
> It can also do charset conversions with some limitations, but the
> nginx.make file has not been modified to install any of the supplied
> conversion tables.
> 
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> Message-Id: <20240830132722.65713-1-abbotti@mev.co.uk>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/nginx.in b/rules/nginx.in
> index ca043460c851..6ee8a2ec1cb8 100644
> --- a/rules/nginx.in
> +++ b/rules/nginx.in
> @@ -41,6 +41,14 @@ config NGINX_HTTP_AUTOINDEX_MODULE
>  	  ngx_http_autoindex_module processes requests ending with the
>  	  slash character and produces a directory listing.
>  
> +config NGINX_HTTP_CHARSET_MODULE
> +	bool
> +	prompt "ngx_http_charset_module"
> +	help
> +	  ngx_http_charset_module adds a charset to the "Content-Type"
> +	  response header field. The module can convert data from one
> +	  charset to another with some limitations.
> +
>  config NGINX_HTTP_FASTCGI_MODULE
>  	bool
>  	prompt "ngx_http_fastcgi_module"
> diff --git a/rules/nginx.make b/rules/nginx.make
> index 5b5669de00a3..85df855e1d0e 100644
> --- a/rules/nginx.make
> +++ b/rules/nginx.make
> @@ -68,7 +68,7 @@ NGINX_CONF_OPT := \
>  	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_V2_MODULE,--with-http_v2_module) \
>  	--with-http_sub_module \
>  	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_GZIP_STATIC_MODULE,--with-http_gzip_static_module) \
> -	--without-http_charset_module \
> +	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_CHARSET_MODULE,,--without-http_charset_module) \
>  	$(call ptx/ifdef, PTXCONF_NGINX_HTTP_GZIP_MODULE,,--without-http_gzip_module) \
>  	--without-http_ssi_module \
>  	--without-http_userid_module \