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

Restrict CURLOPT_PROTOCOLS on defined() instead of version_compare() #92

Merged
merged 1 commit into from
Dec 31, 2013
Merged

Conversation

ozh
Copy link
Collaborator

@ozh ozh commented Dec 30, 2013

Instead of setting CURLOPT_PROTOCOLS upon a version_compare(), why not simply do it upon a defined?

Besides of being simpler, it might

  • cope with potential weird builds of libcurl showing a recent version but not implement that option?
  • fix the Travis errors when using HHVM ?

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 6856025 on ozh:curlopt into 14b5f32 on rmccue:master.

@ozh
Copy link
Collaborator Author

ozh commented Dec 30, 2013

Eh, better regarding Travis, although not fixed yet :)

@rmccue
Copy link
Collaborator

rmccue commented Dec 31, 2013

Interesting error with HHVM now, but way better than before in any case. Thanks! :)

rmccue added a commit that referenced this pull request Dec 31, 2013
Restrict CURLOPT_PROTOCOLS on `defined()` instead of `version_compare()`
@rmccue rmccue merged commit 541e6d0 into WordPress:master Dec 31, 2013
@rmccue
Copy link
Collaborator

rmccue commented Dec 31, 2013

Also worth mentioning that while this looks worse (OMG fatal error!), it fixes the main issue before and doesn't cause any new ones. :)

@rmccue rmccue mentioned this pull request Dec 31, 2013
@ozh ozh deleted the curlopt branch December 31, 2013 08:19
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