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

THRIFT-4845: Stop ignoring small timeouts #1776

Merged
merged 1 commit into from
May 14, 2019
Merged

THRIFT-4845: Stop ignoring small timeouts #1776

merged 1 commit into from
May 14, 2019

Conversation

jmikkola
Copy link

@jmikkola jmikkola commented Apr 5, 2019

Client: php

CURLOPT_TIMEOUT requires a long [0], so it seems that small values
like 0.2 are being rounded to 0, resulting in a lack of any timeout.

This change uses CURLOPT_TIMEOUT_MS, which the PHP documentation
says was "added in cURL 7.16.2. Available since PHP 5.2.3."

[0] https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html

@jmikkola
Copy link
Author

jmikkola commented Apr 5, 2019

The build seems to have failed in the Haskell build for some reason. I'll rebase this after that issue is resolved.

Copy link
Contributor

@jeking3 jeking3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI issues have been resolved; please rebase this one to get a clean build. Change looks good as this option was added to cURL 12 years ago.

Client: php

CURLOPT_TIMEOUT requires a long [0], so it seems that small values
like 0.2 are being rounded to 0, resulting in a lack of any timeout.

This change uses CURLOPT_TIMEOUT_MS, which the PHP documentation
says was "added in cURL 7.16.2. Available since PHP 5.2.3."

[0] https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html
@jmikkola
Copy link
Author

I rebased this on master.

One of the tests failed, though I'm not sure I see why.

@jeking3 jeking3 merged commit 79c2337 into apache:master May 14, 2019
@jmikkola jmikkola deleted the THRIFT-4845 branch May 14, 2019 14:46
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.

2 participants