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

Use file_get_contents when in CLI mode & no certs #962

Merged
merged 6 commits into from Dec 26, 2018
Merged

Use file_get_contents when in CLI mode & no certs #962

merged 6 commits into from Dec 26, 2018

Conversation

triatic
Copy link
Contributor

@triatic triatic commented Dec 11, 2018

Use file_get_contents when in CLI mode with no root certificates for cUrl. file_get_contents can natively use system root certificates.

Relates to #954

Use file_get_contents when in CLI mode with no root certificates for cUrl. file_get_contents can naively use system root certificates.
Copy link
Member

@logmanoriginal logmanoriginal left a comment

Choose a reason for hiding this comment

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

Thanks for the PR!

Find below a few comments to make the code more consistent with the remaining file. These changes shouldn't affect the functional behavior, but maybe you can test it anyway?

lib/contents.php Outdated Show resolved Hide resolved
lib/contents.php Outdated Show resolved Hide resolved
@triatic
Copy link
Contributor Author

triatic commented Dec 12, 2018

I've implemented the suggested changes and everything still works.

@triatic
Copy link
Contributor Author

triatic commented Dec 12, 2018

It would probably be neater if I put all the cUrl stuff in a conditional statement. Would this be ok?

@logmanoriginal
Copy link
Member

Thanks for the updates! You are right, separating implementation makes sense. The function has become very large, so it needs refactoring in the future, but we'll leave that for another time. Merging now...

@logmanoriginal logmanoriginal merged commit dc83962 into RSS-Bridge:master Dec 26, 2018
@triatic triatic deleted the patch-3 branch December 27, 2018 13:42
infominer33 pushed a commit to web-work-tools/rss-bridge that referenced this pull request Apr 17, 2020
…dge#962)

file_get_contents can natively use system root certificates, so use file_get_contents when in CLI mode with no root certificates for cURL.
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.

None yet

2 participants