GH-14111 main/streams: adding SO_LINGER to stream options. #14129
Conversation
This file contains 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
devnexen
force-pushed
the
stream_option_update
branch
from
adb3644 to
bdd35ea
Compare
devnexen
force-pushed
the
stream_option_update
branch
2 times, most recently
from
16c185c to
19e8ddc
Compare
bukka
requested changes
May 12, 2024
Comment on lines
4
to
23
| <?php | ||
| if (getenv("SKIP_ONLINE_TESTS")) die('skip online test'); | ||
| if (!in_array('https', stream_get_wrappers())) die('skip: https wrapper is required'); | ||
| ?> | ||
| --FILE-- | ||
| <?php | ||
| $context = stream_context_create(['socket' => ['so_linger' => false]]); | ||
| var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false); | ||
| $context = stream_context_create(['socket' => ['so_linger' => PHP_INT_MAX + 1]]); | ||
| var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false); | ||
| $context = stream_context_create(['socket' => ['so_linger' => 3]]); | ||
| var_dump(file_get_contents('https://httpbin.org/get', false, $context) !== false); | ||
| ?> | ||
| --EXPECTF-- | ||
| Warning: file_get_contents(https://httpbin.org/get): Failed to open stream: Invalid `so_linger` value in %s on line %d | ||
| bool(false) | ||
|
|
||
| Warning: file_get_contents(https://httpbin.org/get): Failed to open stream: Invalid `so_linger` value in %s on line %d | ||
| bool(false) | ||
| bool(true) |
There was a problem hiding this comment.
please don't add any online tests - they are useless and should be used as last resort. This should be done using a proper test that will will properly delay the data reading on server side so the lingering can be properly tested.
main/streams/xp_socket.c
Outdated
| @@ -719,9 +748,27 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t * | |||
| } | |||
| #endif | |||
|
|
|||
| #ifdef SO_LINGER | |||
| if (PHP_STREAM_CONTEXT(stream) | |||
| && (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "so_linger")) != NULL) { | |||
There was a problem hiding this comment.
It's already part of socket option so there is no point for so_ prefix.
There was a problem hiding this comment.
well I added it to have consistency but I do not mind removing it
main/php_network.h
Outdated
| @@ -280,7 +282,7 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd, | |||
| php_network_connect_socket((sock), (addr), (addrlen), 0, (timeout), NULL, NULL) | |||
|
|
|||
| PHPAPI php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned port, | |||
| int socktype, long sockopts, zend_string **error_string, int *error_code | |||
| int socktype, long sockopts, long linger, zend_string **error_string, int *error_code | |||
There was a problem hiding this comment.
I think it might be better to introduce something more generic that can be used for not just linger so we don't have to change this function if there are other values needed. It could be either completely opaque or just some pointer to union that can hold multiple types.
devnexen
force-pushed
the
stream_option_update
branch
4 times, most recently
from
a8f1613 to
ea791a3
Compare
devnexen
force-pushed
the
stream_option_update
branch
from
ea791a3 to
95d107e
Compare
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.
No description provided.