Mask USR1/HUP while waiting for preloading #20079
Open
+33
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arnaud-lb
commented
Oct 6, 2025
| * Block the USR1 and HUP signals from being delivered during the | ||
| * syscall when running the apache2handler SAPI, as these are not | ||
| * supposed to terminate the process. See GH-20051. */ | ||
| bool is_apache2handler = strcmp(sapi_module.name, "apache2handler") == 0; |
There was a problem hiding this comment.
A possible alternative to this check would be to mask signals in php_apache_server_startup, similarly to FPM.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Possible alternative fix for GH-20051 (#20051 (comment))
Preloading may fork a process and wait for it to finish. In case
waitpid()is interrupted, the parent exits with a fatal error. This is fine when the syscall is interrupted by a signal whose disposition is set to terminate the process, but not otherwise.In the apache2handler SAPI, the parent is the control process. Restarting apache2 is done by sending SIGUSR1 or SIGHUP to the control process. Doing that during the
waitpid()syscall would cause the control process to exit instead.Block the USR1 and HUP signals from being delivered during the syscall when running the apache2handler SAPI, as these are not supposed to terminate the process.
FPM is fine as it masks relevant signals during php startup.
cc @welcomycozyhom @dstogov