Commit 78b500bf59ad302d77f3291f9a57adee624032a4
2016-08-04T12:45:19
Merge pull request #3850 from wildart/custom-tls Enable https transport for custom TLS streams
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/settings.c b/src/settings.c
index 4a6e0f3..cb2317f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -29,9 +29,7 @@ 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
diff --git a/src/transport.c b/src/transport.c
index 327052f..32f8464 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -29,9 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
static transport_definition transports[] = {
{ "git://", git_transport_smart, &git_subtransport_definition },
{ "http://", git_transport_smart, &http_subtransport_definition },
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
{ "https://", git_transport_smart, &http_subtransport_definition },
-#endif
{ "file://", git_transport_local, NULL },
#ifdef GIT_SSH
{ "ssh://", git_transport_smart, &ssh_subtransport_definition },
diff --git a/src/transports/http.c b/src/transports/http.c
index 4fbbfbb..30520a0 100644
--- a/src/transports/http.c
+++ b/src/transports/http.c
@@ -620,7 +620,6 @@ static int http_connect(http_subtransport *t)
error = git_stream_connect(t->io);
-#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL)
if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
git_stream_is_encrypted(t->io)) {
git_cert *cert;
@@ -640,7 +639,7 @@ static int http_connect(http_subtransport *t)
return error;
}
}
-#endif
+
if (error < 0)
return error;
diff --git a/tests/core/features.c b/tests/core/features.c
index 85cddfe..cf5e190 100644
--- a/tests/core/features.c
+++ b/tests/core/features.c
@@ -17,11 +17,7 @@ void test_core_features__0(void)
cl_assert((caps & GIT_FEATURE_THREADS) == 0);
#endif
-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
cl_assert((caps & GIT_FEATURE_HTTPS) != 0);
-#else
- cl_assert((caps & GIT_FEATURE_HTTPS) == 0);
-#endif
#if defined(GIT_SSH)
cl_assert((caps & GIT_FEATURE_SSH) != 0);