diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2016-12-17 14:23:35 +0000 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-12-17 14:23:35 +0000 |
| commit | 061a0ad1f9a33aab07421b51db4194c5fdce2357 (patch) | |
| tree | 94f9ff06d7ea79e2a40b7965581fb6492d61e494 | |
| parent | c5e6ba289266e56b8e7f7c9b463aa7008d4b0258 (diff) | |
| download | libgit2-061a0ad1f9a33aab07421b51db4194c5fdce2357.tar.gz | |
settings: don't hard-code HTTPS capability
This partially reverts bdec62dce1c17465b7330100ea2f71e63fc411dd which activates
the transport code-paths which allow you to use a custom TLS implementation
without having to have one at build-time.
However the capabilities describe how libgit2 was built, not what it could
potentially support, bring back the ifdefs so we only say we support HTTPS if
libgit2 was itself built with a TLS implementation.
| -rw-r--r-- | src/settings.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings.c b/src/settings.c index cb2317f74..4a6e0f353 100644 --- a/src/settings.c +++ b/src/settings.c @@ -29,7 +29,9 @@ int git_libgit2_features(void) #ifdef GIT_THREADS | GIT_FEATURE_THREADS #endif +#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) | GIT_FEATURE_HTTPS +#endif #if defined(GIT_SSH) | GIT_FEATURE_SSH #endif |