Fix GH-16800: ftp functions can abort with EINTR #17327
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
This adds wrappers around recv(), send(), and php_pollfd_for_ms() to
handle EINTR.
This is a bit hard to test on its own, but it is testable manually using
the following script:
```php
pcntl_signal(SIGUSR1, function() {
var_dump(func_get_args());
}, false);
var_dump(getmypid());
sleep(10);
$ftp = ftp_connect('127.0.0.1');
ftp_login($ftp, 'user', 'pass');
ftp_put($ftp, 'testfile', 'testfile');
```
in combination with an infinite while loop that sends SIGUSR1 to the
process.
Girgias
approved these changes
Jan 2, 2025
| @@ -1387,6 +1387,22 @@ ftp_getresp(ftpbuf_t *ftp) | |||
| } | |||
| /* }}} */ | |||
|
|
|||
| static ssize_t my_send_wrapper_with_restart(php_socket_t fd, const void *buf, size_t size, int flags) { | |||
There was a problem hiding this comment.
Maybe?
Suggested change
| static ssize_t my_send_wrapper_with_restart(php_socket_t fd, const void *buf, size_t size, int flags) { | |
| static ssize_t php_ftp_send_wrapper_with_restart(php_socket_t fd, const void *buf, size_t size, int flags) { |
And similar for the other ones
There was a problem hiding this comment.
Given that these are static functions, I don't think a php_ftp_ prefix is necessary.
There was a problem hiding this comment.
Indeed what cmb says, and the fact that the other static functions don't have an php_ftp prefix either
charmitro
pushed a commit
to wasix-org/php
that referenced
this pull request
Mar 13, 2025
This adds wrappers around recv(), send(), and php_pollfd_for_ms() to
handle EINTR.
This is a bit hard to test on its own, but it is testable manually using
the following script:
```php
pcntl_signal(SIGUSR1, function() {
var_dump(func_get_args());
}, false);
var_dump(getmypid());
sleep(10);
$ftp = ftp_connect('127.0.0.1');
ftp_login($ftp, 'user', 'pass');
ftp_put($ftp, 'testfile', 'testfile');
```
in combination with an infinite while loop that sends SIGUSR1 to the
process.
Closes phpGH-17327.
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.
This adds wrappers around recv(), send(), and php_pollfd_for_ms() to handle EINTR.
This is a bit hard to test on its own, but it is testable manually using the following script:
in combination with an infinite while loop that sends SIGUSR1 to the process.