Skip to content
This repository has been archived by the owner on Aug 25, 2022. It is now read-only.

Fix curl's version verification #51

Merged
merged 2 commits into from
Jun 11, 2014
Merged

Conversation

Taluu
Copy link
Contributor

@Taluu Taluu commented Jun 11, 2014

Oops, something went awfully wrong ; we need to change to constant only if we have a version below (and not below or equal), and while we're at it, divide the timeout by 1000 rather than multiplying it by 1000. We want seconds, not nanoseconds !

Oops, something went awfully wrong ; we need to change to constant only if we have a version __below__ (and not __below *or equal*__), and while we're at it, divide the timeout by 1000 rather than multiplying it by 1000. We want seconds, not nanoseconds !
@guillaumepotier
Copy link
Member

Don't understand your condition. You seem to only check a specific version against all the others (did not check version compare function though )

@Taluu
Copy link
Contributor Author

Taluu commented Jun 11, 2014

I'm only checking if the curl version is greater than the proposed one, which implements the (connect) timeout in ms.

So, if we have a version below 7.16.2 (version_compare should return -1 then), we have to use the old constants

Gotta fix it again then (getting fucking lost with all these -1, 0, 1)

@Taluu
Copy link
Contributor Author

Taluu commented Jun 11, 2014

Much better like this. :)

@guillaumepotier
Copy link
Member

Great. Could you merge, tag accordingly and update the new version in our Wisembly project ?

Thx

Taluu added a commit that referenced this pull request Jun 11, 2014
Fix curl's version verification
@Taluu Taluu merged commit f52135c into Wisembly:master Jun 11, 2014
@Taluu Taluu deleted the fix-curl-verif branch June 11, 2014 19:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants