proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-20 19:55:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove conditions that prevent use of custom TLS stream

Browse Source
This commit is contained in:
wildart 2016-07-06 13:06:25 -04:00
parent d8243465be
commit bdec62dce1
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings.c
View File

@ -29,9 +29,7 @@ int git_libgit2_features(void)
#ifdef GIT_THREADS #ifdef GIT_THREADS
| GIT_FEATURE_THREADS | GIT_FEATURE_THREADS
#endif #endif
#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
| GIT_FEATURE_HTTPS | GIT_FEATURE_HTTPS
#endif
#if defined(GIT_SSH) #if defined(GIT_SSH)
| GIT_FEATURE_SSH | GIT_FEATURE_SSH
#endif #endif

2
src/transport.c
View File

@ -29,9 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
static transport_definition transports[] = { static transport_definition transports[] = {
{ "git://", git_transport_smart, &git_subtransport_definition }, { "git://", git_transport_smart, &git_subtransport_definition },
{ "http://", git_transport_smart, &http_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 }, { "https://", git_transport_smart, &http_subtransport_definition },
#endif
{ "file://", git_transport_local, NULL }, { "file://", git_transport_local, NULL },
#ifdef GIT_SSH #ifdef GIT_SSH
{ "ssh://", git_transport_smart, &ssh_subtransport_definition }, { "ssh://", git_transport_smart, &ssh_subtransport_definition },

3
src/transports/http.c
View File

@ -620,7 +620,6 @@ static int http_connect(http_subtransport *t)
error = git_stream_connect(t->io); 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 && if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
git_stream_is_encrypted(t->io)) { git_stream_is_encrypted(t->io)) {
git_cert *cert; git_cert *cert;
@ -640,7 +639,7 @@ static int http_connect(http_subtransport *t)
return error; return error;
} }
} }
#endif
if (error < 0) if (error < 0)
return error; return error;

4
tests/core/features.c
View File

@ -17,11 +17,7 @@ void test_core_features__0(void)
cl_assert((caps & GIT_FEATURE_THREADS) == 0); cl_assert((caps & GIT_FEATURE_THREADS) == 0);
#endif #endif
#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
cl_assert((caps & GIT_FEATURE_HTTPS) != 0); cl_assert((caps & GIT_FEATURE_HTTPS) != 0);
#else
cl_assert((caps & GIT_FEATURE_HTTPS) == 0);
#endif
#if defined(GIT_SSH) #if defined(GIT_SSH)
cl_assert((caps & GIT_FEATURE_SSH) != 0); cl_assert((caps & GIT_FEATURE_SSH) != 0);