Add --enable-cli-fpm to link the FPM SAPI into the CLI binary (php --fpm)

NEWS

@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? ????, PHP 8.6.0beta3
 
 - CLI:
+  . Added the --enable-cli-fpm configure option, which links the FPM SAPI into
+    the php binary so that "php --fpm" runs php-fpm. (Matthieu Napoli)
   . Fixed bug GH-23242 (PHP development server does not support Expect
     100-continue flow control). (Sjoerd Langkemper)
 

UPGRADING

@@ -506,6 +506,9 @@ PHP 8.6 UPGRADE NOTES
 - CLI:
   . The built-in development server now accepts requests using the HTTP QUERY
     method instead of returning 501 Not Implemented.
+  . When PHP is configured with --enable-cli-fpm, the php binary also contains
+    the FPM SAPI: "php --fpm [php-fpm options]" behaves like php-fpm. The flag
+    is only recognized as the first argument. The default build is unchanged.
 
 ========================================
 4. Deprecated Functionality

UPGRADING.INTERNALS

@@ -227,6 +227,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . Added zend_string_ends_with() and related variants.
   . Added trait support for internal classes.
   . Added do_php_cli().
+  . Added do_php_fpm(), the former main() of php-fpm.
 
 ========================
 2. Build system changes
@@ -270,6 +271,12 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The CLI SAPI can not be disabled when building the embed SAPI
     (--enable-embed is incompatible with --disable-cli).
 
+- FPM:
+  . The --enable-fpm option moved to sapi/fpm/config0.m4 so that other SAPIs
+    can test $PHP_FPM. The FPM sources other than the main() entry point are
+    now built into PHP_FPM_SHARED_OBJS. The new --enable-cli-fpm option links
+    them into the CLI binary.
+
 ========================
 3. Module changes
 ========================

sapi/cli/config.m4

@@ -5,6 +5,22 @@ PHP_ARG_ENABLE([cli],
   [yes],
   [no])
 
+PHP_ARG_ENABLE([cli-fpm],
+  [whether to link FPM into the CLI binary],
+  [AS_HELP_STRING([--enable-cli-fpm],
+    [Link the FPM SAPI into the CLI binary, so that "php --fpm" runs php-fpm
+    (requires --enable-fpm)])],
+  [no],
+  [no])
+
+if test "$PHP_CLI_FPM" != "no"; then
+  if test "$PHP_CLI" = "no" || test "$PHP_FPM" = "no"; then
+    AC_MSG_ERROR([--enable-cli-fpm requires both the CLI and the FPM SAPI])
+  fi
+  AC_DEFINE([PHP_CLI_WITH_FPM], [1],
+    [Define to 1 if the FPM SAPI is linked into the CLI binary.])
+fi
+
 dnl The embed SAPI requires the CLI sources for do_php_cli().
 if test "$PHP_EMBED" != "no" -a "$PHP_CLI" = "no"; then
   AC_MSG_ERROR([--enable-embed requires the CLI SAPI, do not use --disable-cli with --enable-embed])
@@ -47,6 +63,8 @@ if test "$PHP_CLI" != "no"; then
     [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1],
     [PHP_CLI_SHARED_OBJS])
   PHP_CLI_OBJS="$PHP_CLI_OBJS $PHP_CLI_SHARED_OBJS"
+  AS_VAR_IF([PHP_CLI_FPM], [no],,
+    [PHP_CLI_OBJS="$PHP_CLI_OBJS \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_SHARED_OBJS)"])
 
   AS_CASE([$host_alias],
     [*aix*], [

sapi/cli/php.1.in

@@ -365,6 +365,12 @@ Shows configuration for extension
 .TP
 .B \-\-ini
 Show configuration file names
+.TP
+.B \-\-fpm
+Run as
+.BR php\-fpm (8),
+passing the remaining arguments to it. Only available when PHP was configured
+with \-\-enable\-cli\-fpm, and only recognized as the first argument.
 .SH FILES
 .TP 15
 .B php\-cli.ini

sapi/cli/php_cli.c

@@ -482,6 +482,9 @@ static void php_cli_usage(char *argv0)
 				"\n"
 				"  --ini            Show configuration file names\n"
 				"  --ini=diff       Show INI entries that differ from the built-in default\n"
+#ifdef PHP_CLI_WITH_FPM
+				"  --fpm            Run as php-fpm, passing the remaining arguments to it\n"
+#endif
 				"\n"
 				"  --rf <name>      Show information about function <name>.\n"
 				"  --rc <name>      Show information about class <name>.\n"

sapi/cli/php_cli_main.c

@@ -12,8 +12,17 @@
 
 #include "php.h"
 #include "cli.h"
+#ifdef PHP_CLI_WITH_FPM
+#include "sapi/fpm/fpm/fpm.h"
+#endif
 
 int main(int argc, char *argv[])
 {
+#ifdef PHP_CLI_WITH_FPM
+	/* "php --fpm [args]" runs the FPM SAPI, which ignores the "--fpm" option. */
+	if (argc > 1 && strcmp(argv[1], "--fpm") == 0) {
+		return do_php_fpm(argc, argv);
+	}
+#endif
 	return do_php_cli(argc, argv);
 }

sapi/cli/tests/cli_fpm.phpt

@@ -0,0 +1,24 @@
+--TEST--
+php --fpm runs the FPM SAPI
+--SKIPIF--
+<?php
+include "skipif.inc";
+$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
+if (!str_contains((string) shell_exec("$php --fpm -n -v 2>&1"), 'fpm-fcgi')) {
+    die("skip PHP was not built with --enable-cli-fpm");
+}
+?>
+--FILE--
+<?php
+$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
+
+// As the first argument, --fpm switches to the FPM SAPI.
+preg_match('/^Server API => .*$/m', shell_exec("$php --fpm -n -i"), $m);
+var_dump($m[0]);
+
+// Anywhere else it is an ordinary argument.
+var_dump(shell_exec("$php -n -r 'echo \$argv[1];' -- --fpm"));
+?>
+--EXPECT--
+string(25) "Server API => FPM/FastCGI"
+string(5) "--fpm"

sapi/fpm/config.m4

@@ -1,10 +1,3 @@
-PHP_ARG_ENABLE([fpm],
-  [for FPM build],
-  [AS_HELP_STRING([--enable-fpm],
-    [Enable building of the fpm SAPI executable])],
-  [no],
-  [no])
-
 dnl Configure checks.
 AC_DEFUN([PHP_FPM_CLOCK], [
 AC_CHECK_FUNCS([clock_gettime],, [
@@ -473,9 +466,18 @@ if test "$PHP_FPM" != "no"; then
 
   PHP_SELECT_SAPI([fpm],
     [program],
-    [$PHP_FPM_FILES $PHP_FPM_TRACE_FILES $PHP_FPM_SD_FILES],
+    [php_fpm_main.c],
     [-I$abs_srcdir/sapi/fpm -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 
+  dnl Everything except the main() entry point, so that the CLI binary can link
+  dnl the same objects for do_php_fpm() (--enable-cli-fpm).
+  PHP_ADD_SOURCES_X([sapi/fpm],
+    [$PHP_FPM_FILES $PHP_FPM_TRACE_FILES $PHP_FPM_SD_FILES],
+    [-I$abs_srcdir/sapi/fpm -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1],
+    [PHP_FPM_SHARED_OBJS])
+  PHP_FPM_OBJS="$PHP_FPM_OBJS $PHP_FPM_SHARED_OBJS"
+  PHP_SUBST([PHP_FPM_SHARED_OBJS])
+
   AS_CASE([$host_alias],
     [*aix*], [
       BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --tag=CC --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
@@ -489,4 +491,5 @@ if test "$PHP_FPM" != "no"; then
   PHP_SUBST([SAPI_FPM_PATH])
   PHP_SUBST([BUILD_FPM])
   PHP_SUBST([FPM_EXTRA_LIBS])
+  AS_VAR_IF([PHP_CLI_FPM], [no],, [EXTRA_LIBS="$EXTRA_LIBS $FPM_EXTRA_LIBS"])
 fi

sapi/fpm/config0.m4

@@ -0,0 +1,6 @@
+PHP_ARG_ENABLE([fpm],
+  [for FPM build],
+  [AS_HELP_STRING([--enable-fpm],
+    [Enable building of the fpm SAPI executable])],
+  [no],
+  [no])

sapi/fpm/fpm/fpm.h

@@ -41,6 +41,8 @@ enum fpm_init_return_status {
 };
 
 int fpm_run(int *max_requests);
+/* this performs full fpm-SAPI boot: the former main() of php-fpm. */
+int do_php_fpm(int argc, char *argv[]);
 enum fpm_init_return_status fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root, int force_daemon, int force_stderr);
 
 struct fpm_globals_s {

sapi/fpm/fpm/fpm_main.c

@@ -131,6 +131,7 @@ static const opt_struct OPTIONS[] = {
 	{'D', 0, "daemonize"},
 	{'F', 0, "nodaemonize"},
 	{'O', 0, "force-stderr"},
+	{20, 0, "fpm"}, /* "php --fpm", see sapi/cli/php_cli_main.c */
 	{'-', 0, NULL} /* end of args */
 };
 
@@ -1495,7 +1496,7 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
 }
 /* }}} */
 
-PHP_FUNCTION(apache_request_headers) /* {{{ */
+PHP_FUNCTION(fpm_apache_request_headers) /* {{{ */
 {
 	fcgi_request *request;
 
@@ -1531,8 +1532,8 @@ static zend_module_entry cgi_module_entry = {
 	STANDARD_MODULE_PROPERTIES
 };
 
-/* {{{ main */
-int main(int argc, char *argv[])
+/* {{{ do_php_fpm */
+int do_php_fpm(int argc, char *argv[])
 {
 	int exit_status = FPM_EXIT_OK;
 	int c, use_extended_info = 0;
@@ -1668,6 +1669,9 @@ int main(int argc, char *argv[])
 				force_stderr = 1;
 				break;
 
+			case 20: /* php --fpm */
+				break;
+
 			default:
 			case 'h':
 			case '?':

sapi/fpm/fpm/fpm_main.stub.php

@@ -4,9 +4,10 @@
 
 function fastcgi_finish_request(): bool {}
 
+/** @implementation-alias fpm_apache_request_headers */
 function apache_request_headers(): array {}
 
-/** @alias apache_request_headers */
+/** @implementation-alias fpm_apache_request_headers */
 function getallheaders(): array {}
 
 function fpm_get_status(): array|false {}

sapi/fpm/php_fpm_main.c

@@ -0,0 +1,19 @@
+/*
+   +----------------------------------------------------------------------+
+   | Copyright © The PHP Group and Contributors.                          |
+   +----------------------------------------------------------------------+
+   | This source file is subject to the Modified BSD License that is      |
+   | bundled with this package in the file LICENSE, and is available      |
+   | through the World Wide Web at <https://www.php.net/license/>.        |
+   |                                                                      |
+   | SPDX-License-Identifier: BSD-3-Clause                                |
+   +----------------------------------------------------------------------+
+*/
+
+#include "php.h"
+#include "fpm/fpm.h"
+
+int main(int argc, char *argv[])
+{
+	return do_php_fpm(argc, argv);
+}