Fix GHSA-865w-9rf3-2wh5: FPM: Logs from childrens may be altered

Merge branch 'PHP-8.1' into PHP-8.2

Fix GH-10461: Postpone FPM child freeing in event loop

This is to prevent after free accessing of the child event that might
happen when child is killed and the message is delivered at t

Fix GH-10461: Postpone FPM child freeing in event loop

This is to prevent after free accessing of the child event that might
happen when child is killed and the message is delivered at that same
time.

Also fixes GH-10889 and properly fixes GH-8517 that was not previously
fixed correctly.

show more ...

Merge branch 'PHP-8.1' into PHP-8.2

Fix GH-8517: FPM child pointer can be potentially uninitialized

There might be a moment when the child log event is executed after
freeing a child. That could possibly happen if the chil

Fix GH-8517: FPM child pointer can be potentially uninitialized

There might be a moment when the child log event is executed after
freeing a child. That could possibly happen if the child output is
triggered at the same as the terminating of the child. Then the output
event could be potentially processed after the terminating event which
would cause this kind of issue.

The issue might got more visible after introducing the log_stream on
a child because it is more likely that this cannot be dereferenced
after free. However it is very hard to reproduce this issue so there
is no test for this.

The fix basically prevents passing a child pointer and instead passes
the child PID and then looks the child up by the PID when it is being
processed. This is obviously slower but it is a safe way to do it and
the slow down should not be hopefully visible in a way that it would
overload a master process.

show more ...

Merge branch 'PHP-8.1' into PHP-8.2

Merge branch 'PHP-8.0' into PHP-8.1

Fix GH-9754: SaltStack hangs when running php-fpm 8.1.11

SaltStack uses Python subprocess and redirects stderr to stdout which is
then piped to the returned output. If php-fpm starts in

Fix GH-9754: SaltStack hangs when running php-fpm 8.1.11

SaltStack uses Python subprocess and redirects stderr to stdout which is
then piped to the returned output. If php-fpm starts in daemonized mode,
it should close stderr. However a fix introduced in GH-8913 keeps stderr
around so it can be later restored. That causes the issue reported in
GH-9754. The solution is to keep stderr around only when php-fpm runs in
foreground as the issue is most likely visible only there. Basically
there is no need to restore stderr when php-fpm is daemonized.

show more ...

Merge branch 'PHP-8.1'

Merge branch 'PHP-8.0' into PHP-8.1

Fix GH-8885: access.log with stderr writes logs to error_log after reload

This fix allows restoring the the original stderr so the logs are
correctly written.

Merge branch 'PHP-8.1'

Merge branch 'PHP-8.0' into PHP-8.1

FPM fix strict prototype warnings.

Closes GH-8986.

Add a bit verbosity in FPM logs

Merge branch 'PHP-8.0' into PHP-8.1

Fix bug #67764: fpm: syslog.ident does not work

Mark various functions with void arguments.

This fixes a bunch of [-Wstrict-prototypes] warning,
because in C func() and func(void) have different semantics.

Suppress bogus [-Wlogical-op] warning from GCC

See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
which emits the warning for (errno == EWOULDBLOCK || errno == EAGAIN)

Suppress bogus [-Wlogical-op] warning from GCC

See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
which emits the warning for (errno == EWOULDBLOCK || errno == EAGAIN)
which is the correct way of handling errors as the value of EWOULDBLOCK
and EAGAIN is implementation defined.

Therefore introduce a new macro function PHP_IS_TRANSIENT_ERROR()
which handles the case when EWOULDBLOCK and EAGAIN are identical.

Thanks to @twose for the idea.

show more ...

Fix [-Wundef] warning in FPM SAPI

Fix bug #77653 (operator displayed instead of the real error message)

Fix bug #78334 (fpm log prefix message includes wrong stdout/stderr notation)

Fix bug #77430 (php-fpm crashes with Main process exited)

Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

show more ...

Store zlog stream in each child so it can be reused

This change results in using the same buffer for multiple
stdio events which should fix inconsistencies of handling
messages that

Store zlog stream in each child so it can be reused

This change results in using the same buffer for multiple
stdio events which should fix inconsistencies of handling
messages that are not ended with a new line and possibly
very long messages that are split to multiple events.

show more ...