Re-fix GH-8409: SSL handshake timeout persistent connections hanging #9332
Conversation
This patch reverts part of d052742, d052742 makes Swoole/Swow can not work anymore, because Coroutine will yield to another one during socket operation, and EG(record_errors) assertion will always fail, and zend_begin_record_errors was only used during compile time before. Use zend_try and zend_catch to fix it, and this patch also can be applied to PHP-8.0.
|
This is not a long-term solution (including zend_replace_error_handling, they are ugly but useful things), I think we need to stop trigger warnings everywhere without restrictions and use exceptions instead. |
|
@twose This looks much better and nice test - didn't realise that I could actually use shutdown function for that. Can you separate it on revert and the actual fix so I can also apply it to 8.0? |
|
just two commits in this PR basically - it will make it easier for me... |
|
Or you can actually merge it yourself as you have access so if you could do that in that way, that would be awesome! |
|
@bukka I can revert the previous patch on PHP-8.1, and apply this patch to PHP-8.0 manually, then merge it into all branches, is that OK? |
|
@twose Yeah that would be perfect! Thanks for sorting that out. |
|
@bukka I've done that, hope I did it correctly. Nice talking with you, thanks for your review! |
|
Nice one. All looks good to me except just missing NEWS in 8.1 (we update NEWS in all active branches basically). Fixed in 7f64a8d |
This patch reverts part of d052742, d052742 makes Swoole/Swow can not work anymore, because Coroutine will yield to another one during socket operation, and EG(record_errors) assertion will always fail, and zend_begin_record_errors was only used during compile time before.
Use zend_try and zend_catch to fix it, and this patch also can be applied to PHP-8.0.