diff options
| author | Edward Thomson <ethomson@github.com> | 2016-08-04 12:45:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-04 12:45:19 -0400 |
| commit | 78b500bf59ad302d77f3291f9a57adee624032a4 (patch) | |
| tree | dcce1151cc6989bf6d99847f6b14cc3cc8b9ad00 | |
| parent | da7f9feb5c964dacfe39615d421a3ffd0b20b953 (diff) | |
| parent | bdec62dce1c17465b7330100ea2f71e63fc411dd (diff) | |
| download | libgit2-78b500bf59ad302d77f3291f9a57adee624032a4.tar.gz | |
Merge pull request #3850 from wildart/custom-tls
Enable https transport for custom TLS streams
| -rw-r--r-- | src/settings.c | 2 | ||||
| -rw-r--r-- | src/transport.c | 2 | ||||
| -rw-r--r-- | src/transports/http.c | 3 | ||||
| -rw-r--r-- | tests/core/features.c | 4 |
4 files changed, 1 insertions, 10 deletions
diff --git a/src/settings.c b/src/settings.c index 4a6e0f353..cb2317f74 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 327052fa3..32f8464f6 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 4fbbfbbad..30520a05d 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 85cddfeff..cf5e19063 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); |