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

NETWORKING: Try loading the CA bundle from DATA_PATH #1913

Merged
merged 2 commits into from Nov 3, 2019

Conversation

@bgK
Copy link
Member

bgK commented Nov 2, 2019

So that platforms where libcurl cannot access the native CA store can ship a CA bundle along with the other ScummVM support files.

Also improve libcurl error handling so warnings are issued for failed requests.

bgK added 2 commits Nov 2, 2019
Error messages for failed requests are now printed as warnings.
@bluegr

This comment has been minimized.

Copy link
Member

bluegr commented Nov 3, 2019

Nice work! :)

Where is DATA_PATH declared? It’s not in the configure script

@bgK

This comment has been minimized.

Copy link
Member Author

bgK commented Nov 3, 2019

Where is DATA_PATH declared? It’s not in the configure script

scummvm/configure

Line 5573 in 0c1a04a

append_var DEFINES "-DDATA_PATH=\\\"$datadir\\\""

@bluegr

This comment has been minimized.

Copy link
Member

bluegr commented Nov 3, 2019

Indeed, for some reason I mistyped it when searching through the file.

Nice work! This is quite a straightforward change, and it can be safely merged.

Merging

@bluegr bluegr merged commit 6fa7322 into scummvm:master Nov 3, 2019
1 of 2 checks passed
1 of 2 checks passed
Codacy/PR Quality Review Not up to standards. This pull request quality could be better.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bgK bgK deleted the bgK:cloud-ca-bundle branch Nov 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.