Fix #72409 - return previous handler #1985
Conversation
This patch addresses https://bugs.php.net/bug.php?id=72409 This patch is applied to master compared to PR#1952 which was patching 5.6.x branch of PHP This patch takes into account discussions on PR php#1978 Addressing that rather than have pcntl_signal() return a value to create a new function that can be used to get the current value of the signal handler.
| return; | ||
| } | ||
|
|
||
| if (signo < 1 || signo > 32) { |
There was a problem hiding this comment.
I think it's better to use NSIG instead of hardcode 32
There was a problem hiding this comment.
I was copy-pasting that via pcntl_signal(). The problem with using NSIG is that on my box(linux 4.4.0, libc 2.22-4) it's value is 64, however 32 is the largest defined signal. That said, NSIG on FreeBSD is defined to 32, even though it has SIGLIBRT defined at 33. So, I'm not sure what happens if you're to sigaction() a signal that's not defined in signal.h, or if in general we might look to be smarter about what is the highest signal we support per-platform.
Regardless, this could be something addressed in a distinct PR trying to abstract and remove the hard-coded values.
|
@trowski about the question from the other PR - if this PR gets accepted in 7.1, i don't mind a backport. Though please lets make the gap a bit longer, letting it to go through 7.1 QA first (still it would be beta). Then target 7.0.11 if everything is ok, so merging into 7.0 like after August 4th. Thanks. |
|
@weltling Sounds good, thanks! |
|
Comment on behalf of trowski at php.net: Merged into master and will be included in 7.1.0-beta1. I'll merge the changes down into 7.0 later as suggested. |
This patch addresses https://bugs.php.net/bug.php?id=72409
This patch is applied to master compared to PR #1952 which was
patching 5.6.x branch of PHP
This patch takes into account discussions on PR #1978
Addressing that rather than have pcntl_signal() return a value
to create a new function that can be used to get the current
value of the signal handler.