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

Custom cURL options #40

Merged
merged 1 commit into from
Nov 13, 2014
Merged

Custom cURL options #40

merged 1 commit into from
Nov 13, 2014

Conversation

dstelljes
Copy link
Contributor

So I don't know the status of #18, but this does pretty much the same thing and is slightly more elegant (uses the + operator instead of the foreach). Unlike #18, custom options take precedence... is there a case where that wouldn't be desirable?

@dstelljes
Copy link
Contributor Author

And I intended to open another pull request for this but forgot to change branches: the api.vimeo.com CA certificate is now bundled as a fallback so CURLOPT_SSL_VERIFYPEER or complicated workarounds don't have to be a thing.

@Dashron
Copy link
Contributor

Dashron commented Nov 13, 2014

There's been no communication on the other pull request, so I'm more than happy to merge this one.

Unfortunately I'm not comfortable merging in cert code from a third party. I'm going to need a staff member to do that. Can you split out that code, and go through our CLA: https://developer.vimeo.com/cla.

Once everything is set let me know and I'll make the merge!

@dstelljes
Copy link
Contributor Author

Alright, I just moved the certificate stuff to another branch (dstelljes:bundled-ca) for reference so this pull request only contains the custom options fix. And I just filled out the CLA so we should be all set. Thanks!

Dashron added a commit that referenced this pull request Nov 13, 2014
@Dashron Dashron merged commit 935f304 into vimeo:master Nov 13, 2014
@Dashron
Copy link
Contributor

Dashron commented Nov 13, 2014

Thanks!

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