Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
bdec62dc
Commit
bdec62dc
authored
Jul 06, 2016
by
wildart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove conditions that prevent use of custom TLS stream
parent
d8243465
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 additions
and
10 deletions
+1
-10
src/settings.c
+0
-2
src/transport.c
+0
-2
src/transports/http.c
+1
-2
tests/core/features.c
+0
-4
No files found.
src/settings.c
View file @
bdec62dc
...
@@ -29,9 +29,7 @@ int git_libgit2_features(void)
...
@@ -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
...
...
src/transport.c
View file @
bdec62dc
...
@@ -29,9 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
...
@@ -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
},
...
...
src/transports/http.c
View file @
bdec62dc
...
@@ -620,7 +620,6 @@ static int http_connect(http_subtransport *t)
...
@@ -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)
...
@@ -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
;
...
...
tests/core/features.c
View file @
bdec62dc
...
@@ -17,11 +17,7 @@ void test_core_features__0(void)
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment