fix litespeed SAPI build warnings. #10068
Closed
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
22885e2 to
787d202
Compare
787d202 to
c6bf3b5
Compare
gwanglst
requested changes
Dec 8, 2022
sapi/litespeed/lsapi_main.c
Outdated
Comment on lines
767
to
788
| if (sigaction( SIGINT, &act, NULL) < 0) { | ||
| return -1; | ||
| } | ||
|
|
||
| if (sigaction( SIGQUIT, &act, NULL) < 0) { | ||
| return -1; | ||
| } | ||
| if (sigaction( SIGILL, &act, NULL) < 0) { | ||
| return -1; | ||
| } | ||
| if (sigaction( SIGABRT, &act, NULL) < 0) { | ||
| return -1; | ||
| } | ||
| if (sigaction( SIGBUS, &act, NULL) < 0) { | ||
| return -1; | ||
| } | ||
| if (sigaction( SIGSEGV, &act, NULL) < 0) { | ||
| return -1; | ||
| } | ||
| if (sigaction( SIGTERM, &act, NULL) < 0) { | ||
| return -1; | ||
| } |
There was a problem hiding this comment.
Same, should ignore those errors.
sapi/litespeed/lsapi_main.c
Outdated
Comment on lines
691
to
715
| if (sigaction(SIGINT, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
| if (sigaction(SIGQUIT, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
| if (sigaction(SIGILL, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
| if (sigaction(SIGABRT, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
| if (sigaction(SIGBUS, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
| if (sigaction(SIGSEGV, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
| if (sigaction(SIGTERM, &act, NULL) < 0) { | ||
| return; | ||
| } | ||
|
|
||
| if (sigaction(SIGPROF, &act, NULL) < 0) { | ||
| return; | ||
| } |
There was a problem hiding this comment.
Should ignore those errors. maybe can do
(void)sigaction(SIGINT, &act, NULL);
sapi/litespeed/lsapilib.c
Outdated
| @@ -1368,7 +1362,7 @@ static inline int lsapi_notify_pid( int fd ) | |||
|
|
|||
|
|
|||
| static char s_conn_key_packet[16]; | |||
| static inline int init_conn_key( int fd ) | |||
| static inline __attribute__((unused)) int init_conn_key( int fd ) | |||
There was a problem hiding this comment.
Instead, this function is no longer in use, can be removed.
helpers only called on linux anyways, proper C calls prototypes.
c6bf3b5 to
8b43232
Compare
|
No problem with the change now, just not sure which branch it should be merged to? If want to get the change included in the next release, should patch again |
gwanglst
approved these changes
Dec 9, 2022
|
oh those changes are not bug fixes, so I targeted only master but if @cmb69 advise lower branches l can adapt. |
|
PHP 8.0 is no longer actively supported, so if this is a regular bug fix, it should target PHP-8.1. Otherwise, "master" would be the safer option. Or maybe target PHP-8.2 as a compromise. |
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.
helpers only called on linux anyways, proper C calls prototypes.