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

makefile.m32: fix to allow -ssh2-winssl combination #692

Closed
wants to merge 1 commit into from
Closed

makefile.m32: fix to allow -ssh2-winssl combination #692

wants to merge 1 commit into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Mar 2, 2016

In makefile.m32, option -ssh2 (libssh2) automatically
implied -ssl (OpenSSL) option, with no way to override
it with -winssl. Since both libssh2 and curl support
using Windows's built-in SSL backend, modify the logic
to allow that combination.

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @gknauf, @captain-caveman2k and @bagder to be potential reviewers

vszakats added a commit to curl/curl-for-win that referenced this pull request Mar 2, 2016
* generate .def file and use it when building the .dll,
  making sure to limit the list of exported functions
  to libcurl ones. This should fix the bloated .dll
  and implib.
* allow to build without nghttp2
* build with WinSSL if no other SSL backend is found
* document the reason for -DCURL_LIBSTATIC option
* fix building with WinSSL by using two local curl patches

curl patches were submitted upstream as:
curl/curl#692
curl/curl#693
vszakats added a commit to curl/curl-for-win that referenced this pull request Mar 2, 2016
* generate .def file and use it when building the .dll,
  making sure to limit the list of exported functions
  to libcurl ones. This should fix the bloated .dll
  and implib.
* allow to build without nghttp2
* build with WinSSL if no other SSL backend is found
* document the reason for -DCURL_LIBSTATIC option
* fix building with WinSSL by using two local curl patches

curl patches were submitted upstream as:
curl/curl#692
curl/curl#693
In makefile.m32, option -ssh2 (libssh2) automatically
implied -ssl (OpenSSL) option, with no way to override
it with -winssl. Since both libssh2 and curl support
using Windows's built-in SSL backend, modify the logic
to allow that combination.
@vszakats
Copy link
Member Author

vszakats commented Mar 2, 2016

Updated to default to SSL, like before. It means nothing gets lost after this patch, but now, if -ssh2 is used together with -winssl, SSL won't be forced anymore and let WinSSL be used instead.

@jay
Copy link
Member

jay commented Mar 5, 2016

Thanks, landed in 05401b9.

@jay jay closed this Mar 5, 2016
@vszakats vszakats deleted the ssl branch March 5, 2016 19:09
@lock lock bot locked as resolved and limited conversation to collaborators Jan 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants