[ptxdist] [PATCH 2/2] lighttpd: reenable PHP support via "fast cgi"

[ptxdist] [PATCH 2/2] lighttpd: reenable PHP support via "fast cgi"

[Andreas Helmcke]

With PHP8 at hand, the lighttpd's "fast cgi" feature can be used again.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
  rules/lighttpd.in | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 18827467f..ab8f41ca4 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -17,6 +17,7 @@ menuconfig LIGHTTPD
         select OPENSSL                  if LIGHTTPD_OPENSSL
         select LUA                      if LIGHTTPD_LUA
         select LUA_INSTALL_LIBLUA       if LIGHTTPD_LUA
+       select PHP8                     if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME
         select BUSYBOX_START_STOP_DAEMON                        if LIGHTTPD_STARTSCRIPT
         select BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY          if LIGHTTPD_STARTSCRIPT
         select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS   if LIGHTTPD_STARTSCRIPT
@@ -132,12 +133,14 @@ if LIGHTTPD_MOD_FASTCGI
  
  config LIGHTTPD_MOD_FASTCGI_PHP
         bool
-       depends on BROKEN
         prompt "setup php handling with fastcgi"
         help
           Enables the necessary packages and configuration files
           to enable PHP support in lighttpd
  
+comment "PHP CGI SAPI must be enabled"
+       depends on LIGHTTPD_MOD_FASTCGI_PHP && !PHP8_SAPI_CGI
+
  endif
  
  config LIGHTTPD_MOD_MAGNET
-- 
2.34.1

Re: [ptxdist] [PATCH 2/2] lighttpd: reenable PHP support via "fast cgi"

[Michael Olbrich]

On Mon, May 30, 2022 at 06:57:39PM +0200, Andreas Helmcke wrote:
> With PHP8 at hand, the lighttpd's "fast cgi" feature can be used again.
> 
> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> ---
>  rules/lighttpd.in | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 18827467f..ab8f41ca4 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -17,6 +17,7 @@ menuconfig LIGHTTPD
>         select OPENSSL                  if LIGHTTPD_OPENSSL
>         select LUA                      if LIGHTTPD_LUA
>         select LUA_INSTALL_LIBLUA       if LIGHTTPD_LUA
> +       select PHP8                     if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME
>         select BUSYBOX_START_STOP_DAEMON                        if LIGHTTPD_STARTSCRIPT
>         select BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY          if LIGHTTPD_STARTSCRIPT
>         select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS   if LIGHTTPD_STARTSCRIPT
> @@ -132,12 +133,14 @@ if LIGHTTPD_MOD_FASTCGI
>  config LIGHTTPD_MOD_FASTCGI_PHP
>         bool
> -       depends on BROKEN
>         prompt "setup php handling with fastcgi"
>         help
>           Enables the necessary packages and configuration files
>           to enable PHP support in lighttpd

add an empty line here.

> +comment "PHP CGI SAPI must be enabled"
> +       depends on LIGHTTPD_MOD_FASTCGI_PHP && !PHP8_SAPI_CGI

What happens if PHP8_SAPI_CGI is not enabled? I think it would be better to
have:

config LIGHTTPD_MOD_FASTCGI_PHP
	depends on !PHP8_SAPI_CGI
	[...]

comment "PHP CGI SAPI must be enabled for PHP support"
	depends on !PHP8_SAPI_CGI

This way, one of the two is visible and you cannot enable lighttpd PHP
support unless PHP is configured correctly.

Michael

> +
>  endif
>  config LIGHTTPD_MOD_MAGNET
> -- 
> 2.34.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[ptxdist] [PATCH v2 2/2] lighttpd: reenable PHP support via "fast cgi"

[Andreas Helmcke]

With PHP8 at hand, the lighttpd's "fast cgi" feature can be used again.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
v2 changes:
- better check for correct php configuration
  (removed select PHP8 because of recursive dependency error)

 rules/lighttpd.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 18827467f..41703cce6 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -132,12 +132,15 @@ if LIGHTTPD_MOD_FASTCGI
 
 config LIGHTTPD_MOD_FASTCGI_PHP
 	bool
-	depends on BROKEN
+	depends on PHP8_SAPI_CGI
 	prompt "setup php handling with fastcgi"
 	help
 	  Enables the necessary packages and configuration files
 	  to enable PHP support in lighttpd
 
+comment "PHP CGI SAPI must be enabled"
+	depends on !PHP8_SAPI_CGI
+
 endif
 
 config LIGHTTPD_MOD_MAGNET
-- 
2.34.1

Re: [ptxdist] [APPLIED] lighttpd: reenable PHP support via "fast cgi"

[Michael Olbrich]

Thanks, applied as bc7456eb52d729a77e674caf81f52218be1f1a1f.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:19:39 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> With PHP8 at hand, the lighttpd's "fast cgi" feature can be used again.
> 
> Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <de70efce-e917-56d0-b1d4-ca9cb42a9af8@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 18827467f73c..41703cce6c2e 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -132,12 +132,15 @@ if LIGHTTPD_MOD_FASTCGI
>  
>  config LIGHTTPD_MOD_FASTCGI_PHP
>  	bool
> -	depends on BROKEN
> +	depends on PHP8_SAPI_CGI
>  	prompt "setup php handling with fastcgi"
>  	help
>  	  Enables the necessary packages and configuration files
>  	  to enable PHP support in lighttpd
>  
> +comment "PHP CGI SAPI must be enabled"
> +	depends on !PHP8_SAPI_CGI
> +
>  endif
>  
>  config LIGHTTPD_MOD_MAGNET