Skip to content

Commit 21142c5

Browse files
committed
http: remove cURL
We previously used cURL to support HTTP proxies. Now that we've added this support natively, we can remove the curl dependency.
1 parent 2878ad0 commit 21142c5

File tree

10 files changed

+2
-467
lines changed

10 files changed

+2
-467
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ OPTION(USE_HTTPS "Enable HTTPS support. Can be set to a specific backend" ON)
6060
OPTION(USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF)
6161
OPTION(USE_STANDALONE_FUZZERS "Enable standalone fuzzers (compatible with gcc)" OFF)
6262
OPTION(VALGRIND "Configure build for valgrind" OFF)
63-
OPTION(CURL "Use curl for HTTP if available" ON)
6463
OPTION(USE_EXT_HTTP_PARSER "Use system HTTP_Parser if available" ON)
6564
OPTION(DEBUG_POOL "Enable debug pool allocator" OFF)
6665
OPTION(ENABLE_WERROR "Enable compilation with -Werror" OFF)

src/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,6 @@ IF (WIN32 AND WINHTTP)
125125

126126
LIST(APPEND LIBGIT2_LIBS "rpcrt4" "crypt32" "ole32")
127127
LIST(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
128-
ELSE ()
129-
IF (CURL)
130-
FIND_PKGLIBRARIES(CURL libcurl)
131-
ENDIF ()
132-
IF (CURL_FOUND)
133-
SET(GIT_CURL 1)
134-
LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${CURL_INCLUDE_DIRS})
135-
LIST(APPEND LIBGIT2_LIBS ${CURL_LIBRARIES})
136-
LIST(APPEND LIBGIT2_PC_LIBS ${CURL_LDFLAGS})
137-
ENDIF()
138-
ADD_FEATURE_INFO(cURL GIT_CURL "cURL for HTTP proxy support")
139128
ENDIF()
140129

141130
IF (USE_HTTPS)

src/features.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#cmakedefine GIT_GSSAPI 1
2424
#cmakedefine GIT_WINHTTP 1
25-
#cmakedefine GIT_CURL 1
2625

2726
#cmakedefine GIT_HTTPS 1
2827
#cmakedefine GIT_OPENSSL 1

src/global.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "filter.h"
1414
#include "merge_driver.h"
1515
#include "streams/tls.h"
16-
#include "streams/curl.h"
1716
#include "streams/mbedtls.h"
1817
#include "streams/openssl.h"
1918
#include "thread-utils.h"
@@ -70,7 +69,6 @@ static int init_common(void)
7069
(ret = git_transport_ssh_global_init()) == 0 &&
7170
(ret = git_tls_stream_global_init()) == 0 &&
7271
(ret = git_openssl_stream_global_init()) == 0 &&
73-
(ret = git_curl_stream_global_init()) == 0 &&
7472
(ret = git_mbedtls_stream_global_init()) == 0)
7573
ret = git_mwindow_global_init();
7674

0 commit comments

Comments
 (0)