Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenSSL timeout fix: (backport) #20

Draft
wants to merge 1 commit into
base: 3.1
Choose a base branch
from

Conversation

azat
Copy link

@azat azat commented Oct 10, 2024

Since timeout was already set via setsockopt, we call wait_io_or_timeout() with a very small timeout (5ms) to get a more precise errno, which is used by OpenSSL's error function.

Note (azat): initial patch (mariadb-corporation#250) was wrong:

Georg Richter:

> Timeouts were already set via setsockopt() function before. Since
> the socket already timeout, it will wait andother read/write timeout
> period.  Instead of, we should get wait_io_or_timeout with a timeout of
> a few milliseconds to get the correct errno.

And got reverted in (mariadb-corporation#253).

Upstream: mariadb-corporation@a6fd09f

Since timeout was already set via setsockopt, we call wait_io_or_timeout()
with a very small timeout (5ms) to get a more precise errno, which is used
by OpenSSL's error function.

Note (azat): initial patch (mariadb-corporation#250) was wrong:

  Georg Richter:

    > Timeouts were already set via setsockopt() function before. Since
    > the socket already timeout, it will wait andother read/write timeout
    > period.  Instead of, we should get wait_io_or_timeout with a timeout of
    > a few milliseconds to get the correct errno.

And got reverted in (mariadb-corporation#253).

Upstream: mariadb-corporation@a6fd09f
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@azat azat marked this pull request as draft October 10, 2024 07:04
@azat
Copy link
Author

azat commented Oct 10, 2024

Actually I have couple of questions about upstream patch, let's wait until I will get answers

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants