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
5700ee9c
Commit
5700ee9c
authored
May 01, 2017
by
Edward Thomson
Committed by
GitHub
May 01, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4216 from pks-t/pks/debian-test-failures
Debian HTTPS feature test failure
parents
f86f35d6
417319cc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
CMakeLists.txt
+3
-0
src/settings.c
+1
-1
tests/core/features.c
+2
-0
tests/online/badssl.c
+1
-1
No files found.
CMakeLists.txt
View file @
5700ee9c
...
...
@@ -238,6 +238,7 @@ ENDIF()
IF
(
WIN32 AND WINHTTP
)
ADD_DEFINITIONS
(
-DGIT_WINHTTP
)
ADD_DEFINITIONS
(
-DGIT_HTTPS
)
# Since MinGW does not come with headers or an import library for winhttp,
# we have to include a private header and generate our own import library
...
...
@@ -546,11 +547,13 @@ ENDIF()
IF
(
SECURITY_FOUND
)
ADD_DEFINITIONS
(
-DGIT_SECURE_TRANSPORT
)
ADD_DEFINITIONS
(
-DGIT_HTTPS
)
INCLUDE_DIRECTORIES
(
${
SECURITY_INCLUDE_DIR
}
)
ENDIF
()
IF
(
OPENSSL_FOUND
)
ADD_DEFINITIONS
(
-DGIT_OPENSSL
)
ADD_DEFINITIONS
(
-DGIT_HTTPS
)
INCLUDE_DIRECTORIES
(
${
OPENSSL_INCLUDE_DIR
}
)
SET
(
SSL_LIBRARIES
${
OPENSSL_LIBRARIES
}
)
ENDIF
()
...
...
src/settings.c
View file @
5700ee9c
...
...
@@ -31,7 +31,7 @@ int git_libgit2_features(void)
#ifdef GIT_THREADS
|
GIT_FEATURE_THREADS
#endif
#if
defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
#if
def GIT_HTTPS
|
GIT_FEATURE_HTTPS
#endif
#if defined(GIT_SSH)
...
...
tests/core/features.c
View file @
5700ee9c
...
...
@@ -17,7 +17,9 @@ void test_core_features__0(void)
cl_assert
((
caps
&
GIT_FEATURE_THREADS
)
==
0
);
#endif
#ifdef GIT_HTTPS
cl_assert
((
caps
&
GIT_FEATURE_HTTPS
)
!=
0
);
#endif
#if defined(GIT_SSH)
cl_assert
((
caps
&
GIT_FEATURE_SSH
)
!=
0
);
...
...
tests/online/badssl.c
View file @
5700ee9c
...
...
@@ -4,7 +4,7 @@
static
git_repository
*
g_repo
;
#if
defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
#if
def GIT_HTTPS
static
bool
g_has_ssl
=
true
;
#else
static
bool
g_has_ssl
=
false
;
...
...
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