Fix #62890: default_socket_timeout=-1 causes connection to timeout#5693
Fix #62890: default_socket_timeout=-1 causes connection to timeout#5693cmb69 wants to merge 1 commit intophp:PHP-7.3from
Conversation
While unencrypted connections ignore negative timeouts, SSL/TLS connections did not special case that, and so always failed due to timeout.
|
Thanks! Applied as eadd980. |
Cf. <php/php-src#5693> git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350020 c90b9560-bf6c-de11-be94-00142212c4b1
Cf. <php/php-src#5693> git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350020 c90b9560-bf6c-de11-be94-00142212c4b1
|
@cmb69 Just a note that we don't depend on the system cert store in OpenSSL tests. This has been failing for me as I have got specific setup to switch between OpenSSL versions. Finally got time to look into it and the temporary fix is at 6857081 . To be honest I don't really get why the used test is hitting external link. This would be better to do using ServerClientTestCase and then it could be run in the pipeline. Is there any specific reason why this has been done this way? |
|
No, there is no specific reason for having done it that way (except for simplicity). Would you have time to improve that test case? |
|
@cmb69 hmm I created the test but tried it without those changes (just put it back as it was) and it still passes. Strangely I tried the current test and it also passes. Is this somehow OS specific or something? Did the test fail for you before? If you could try that PR: #6465 and let me know if you are able to make it fail or there is something missing (e.g. if it requires read or something) without the fix, that would be great! |
|
@bukka, if I revert the changes to xp_ssl.c in current HEAD of PHP-7.3, the current test fails: 001+ Warning: file_get_contents(): SSL: Handshake timed out in %s on line %d
001- bool(true)
002+
003+ Warning: file_get_contents(): Failed to enable crypto in %s on line %d
004+
005+ Warning: file_get_contents(https://www.php.net): failed to open stream: operation failed in %s on line %d
006+ bool(false)If I revert the changes to xp_ssl.c in current HEAD of master, the current test succeeds, though. Apparently, some other change fixes the issue. I'm using OpenSSL 1.1.1h in both cases. |
3 participants
While unencrypted connections ignore negative timeouts, SSL/TLS
connections did not special case that, and so always failed due to
timeout.
I'm not sure whether this is the correct approach, since the behavior of negative timeouts is not documented.