[PATCH v5] curl: resolve deprecated curl declarations
From: Seija Kijin <doremylover123@gmail.com>
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Note that this required changing the callbacks of functions because the replacement for these deprecations require a different function signature for the callback and different parameters.
Every change done was made as to minimize changed behavior as well as get the CI to pass again.
Signed-off-by: Seija Kijin <doremylover123@gmail.com>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their
suggested replacements
Signed-off-by: Seija Kijin doremylover123@gmail.comPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v5 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v5 Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v4:
1: ebe36ad23fa ! 1: c8628c53d22 curl: resolve deprecated curl declarations
@@ http.c: void setup_curl_trace(CURL *handle)
curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
}
+#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
-+static void get_curl_allowed_protocols(char* protocol_buff, int from_user)
++static void get_curl_allowed_protocols(struct strbuf *proto_buf, int from_user)
+{
+ unsigned int i = 0;
+
+ if (is_transport_allowed("http", from_user)) {
-+ protocol_buff[i++] = 'h';
-+ protocol_buff[i++] = 't';
-+ protocol_buff[i++] = 't';
-+ protocol_buff[i++] = 'p';
++ strbuf_addstr(proto_buf, "http");
+ }
+
+ if (is_transport_allowed("https", from_user)) {
-+ if (i != 0) {
-+ protocol_buff[i++] = ',';
-+ }
-+
-+ protocol_buff[i++] = 'h';
-+ protocol_buff[i++] = 't';
-+ protocol_buff[i++] = 't';
-+ protocol_buff[i++] = 'p';
-+ protocol_buff[i++] = 's';
++ if (proto_buf->len)
++ strbuf_addch(proto_buf, ',');
++ strbuf_addstr(proto_buf, "https");
+ }
+
+ if (is_transport_allowed("ftp", from_user)) {
-+ if (i != 0) {
-+ protocol_buff[i++] = ',';
-+ }
-+
-+ protocol_buff[i++] = 'f';
-+ protocol_buff[i++] = 't';
-+ protocol_buff[i++] = 'p';
++ if (proto_buf->len)
++ strbuf_addch(proto_buf, ',');
++ strbuf_addstr(proto_buf, "ftp");
+ }
-+ if (is_transport_allowed("ftps", from_user)) {
-+ if (i != 0) {
-+ protocol_buff[i++] = ',';
-+ }
+
-+ protocol_buff[i++] = 'f';
-+ protocol_buff[i++] = 't';
-+ protocol_buff[i++] = 'p';
-+ protocol_buff[i++] = 's';
++ if (is_transport_allowed("ftps", from_user)) {
++ if (proto_buf->len)
++ strbuf_addch(proto_buf, ',');
++ strbuf_addstr(proto_buf, "ftps");
+ }
-
-+ protocol_buff[i] = '\0';
+}
+#else
static long get_curl_allowed_protocols(int from_user)
@@ http.c: static long get_curl_allowed_protocols(int from_user)
#ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2
static int get_curl_http_version_opt(const char *version_string, long *opt)
-@@ http.c: static int get_curl_http_version_opt(const char *version_string, long *opt)
-
- static CURL *get_curl_handle(void)
- {
-+
-+#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
-+char protocol_buff[20];
-+#endif
-+
- CURL *result = curl_easy_init();
-
- if (!result)
@@ http.c: static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20);
curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
-+ get_curl_allowed_protocols(protocol_buff, 0);
-+ curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, protocol_buff);
-+ get_curl_allowed_protocols(protocol_buff, -1);
-+ curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, protocol_buff);
++ {
++ struct strbuf buf = STRBUF_INIT;
++
++ get_curl_allowed_protocols(&buf, 0);
++ curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, buf.buf);
++ strbuf_reset(&buf);
++
++ get_curl_allowed_protocols(&buf, -1);
++ curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, buf.buf);
++ strbuf_release(&buf);
++ }
+#else
curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
get_curl_allowed_protocols(0));INSTALL | 2 +- git-curl-compat.h | 8 ++++++ http-push.c | 6 ++--- http.c | 65 ++++++++++++++++++++++++++++++++++++++--------- http.h | 2 +- remote-curl.c | 31 +++++++++++----------- 6 files changed, 81 insertions(+), 33 deletions(-)
Show changes to 6 files +81 −33
INSTALL, git-curl-compat.h, http-push.c, http.c, http.h, remote-curl.c
diff --git a/INSTALL b/INSTALL index 33447883974..d5694f8c470 100644 --- a/INSTALL +++ b/INSTALL @@ -139,7 +139,7 @@ Issues of note: not need that functionality, use NO_CURL to build without it. - Git requires version "7.19.4" or later of "libcurl" to build + Git requires version "7.19.5" or later of "libcurl" to build without NO_CURL. This version requirement may be bumped in the future. diff --git a/git-curl-compat.h b/git-curl-compat.h index 56a83b6bbd8..38a2237c8fe 100644 --- a/git-curl-compat.h +++ b/git-curl-compat.h @@ -127,3 +127,11 @@ #endif #endif + +/** + * CURLOPT_PROTOCOLS_STR was added in 7.83.0, released in August + * 2022. + */ +#if LIBCURL_VERSION_NUM >= 0x075500 +#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1 +#endif diff --git a/http-push.c b/http-push.c index 5f4340a36e6..7f71316456c 100644 --- a/http-push.c +++ b/http-push.c @@ -198,13 +198,13 @@ static void curl_setup_http(CURL *curl, const char *url, const char *custom_req, struct buffer *buffer, curl_write_callback write_fn) { - curl_easy_setopt(curl, CURLOPT_PUT, 1); + curl_easy_setopt(curl, CURLOPT_UPLOAD, 1); curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_INFILE, buffer); curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len); curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer); - curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer); - curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer); + curl_easy_setopt(curl, CURLOPT_SEEKFUNCTION, seek_buffer); + curl_easy_setopt(curl, CURLOPT_SEEKDATA, buffer); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn); curl_easy_setopt(curl, CURLOPT_NOBODY, 0); curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req); diff --git a/http.c b/http.c index 8a5ba3f4776..bc343656d5d 100644 --- a/http.c +++ b/http.c @@ -157,21 +157,19 @@ size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_) return size / eltsize; } -curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp) +int seek_buffer(void *userp, curl_off_t offset, int origin) { - struct buffer *buffer = clientp; + struct buffer *buffer = userp; - switch (cmd) { - case CURLIOCMD_NOP: - return CURLIOE_OK; - - case CURLIOCMD_RESTARTREAD: - buffer->posn = 0; - return CURLIOE_OK; - - default: - return CURLIOE_UNKNOWNCMD; + if (origin != SEEK_SET) + BUG("seek_buffer only handles SEEK_SET"); + if (offset < 0 || offset >= buffer->buf.len) { + error("curl seek would be outside of buffer"); + return CURL_SEEKFUNC_FAIL; } + + buffer->posn = offset; + return CURL_SEEKFUNC_OK; } size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_) @@ -765,7 +763,34 @@ void setup_curl_trace(CURL *handle) curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, curl_trace); curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL); } +#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR +static void get_curl_allowed_protocols(struct strbuf *proto_buf, int from_user) +{ + unsigned int i = 0; + + if (is_transport_allowed("http", from_user)) { + strbuf_addstr(proto_buf, "http"); + } + + if (is_transport_allowed("https", from_user)) { + if (proto_buf->len) + strbuf_addch(proto_buf, ','); + strbuf_addstr(proto_buf, "https"); + } + if (is_transport_allowed("ftp", from_user)) { + if (proto_buf->len) + strbuf_addch(proto_buf, ','); + strbuf_addstr(proto_buf, "ftp"); + } + + if (is_transport_allowed("ftps", from_user)) { + if (proto_buf->len) + strbuf_addch(proto_buf, ','); + strbuf_addstr(proto_buf, "ftps"); + } +} +#else static long get_curl_allowed_protocols(int from_user) { long allowed_protocols = 0; @@ -781,6 +806,7 @@ static long get_curl_allowed_protocols(int from_user) return allowed_protocols; } +#endif #ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2 static int get_curl_http_version_opt(const char *version_string, long *opt) @@ -923,10 +949,25 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20); curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); +#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR + { + struct strbuf buf = STRBUF_INIT; + + get_curl_allowed_protocols(&buf, 0); + curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, buf.buf); + strbuf_reset(&buf); + + get_curl_allowed_protocols(&buf, -1); + curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, buf.buf); + strbuf_release(&buf); + } +#else curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS, get_curl_allowed_protocols(0)); curl_easy_setopt(result, CURLOPT_PROTOCOLS, get_curl_allowed_protocols(-1)); +#endif + if (getenv("GIT_CURL_VERBOSE")) http_trace_curl_no_data(); setup_curl_trace(result); diff --git a/http.h b/http.h index 3c94c479100..0be9400ef53 100644 --- a/http.h +++ b/http.h @@ -40,7 +40,7 @@ struct buffer { size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf); size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf); size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf); -curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp); +int seek_buffer(void *userp, curl_off_t offset, int origin); /* Slot lifecycle functions */ struct active_request_slot *get_active_slot(void); diff --git a/remote-curl.c b/remote-curl.c index 72dfb8fb86a..540da2b7989 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -717,25 +717,24 @@ static size_t rpc_out(void *ptr, size_t eltsize, return avail; } -static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp) +static int rpc_seek(void *userp, curl_off_t offset, int origin) { - struct rpc_state *rpc = clientp; + struct rpc_state *rpc = userp; - switch (cmd) { - case CURLIOCMD_NOP: - return CURLIOE_OK; + if (origin != SEEK_SET) + BUG("rpc_seek only handles SEEK_SET, not %d", origin); - case CURLIOCMD_RESTARTREAD: - if (rpc->initial_buffer) { - rpc->pos = 0; - return CURLIOE_OK; + if (rpc->initial_buffer) { + if (offset < 0 || offset > rpc->len) { + error("curl seek would be outside of rpc buffer"); + return CURL_SEEKFUNC_FAIL; } - error(_("unable to rewind rpc post data - try increasing http.postBuffer")); - return CURLIOE_FAILRESTART; - - default: - return CURLIOE_UNKNOWNCMD; + rpc->pos = offset; + return CURL_SEEKFUNC_OK; } + + error(_("unable to rewind rpc post data - try increasing http.postBuffer")); + return CURL_SEEKFUNC_FAIL; } struct check_pktline_state { @@ -959,8 +958,8 @@ retry: rpc->initial_buffer = 1; curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, rpc_out); curl_easy_setopt(slot->curl, CURLOPT_INFILE, rpc); - curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, rpc_ioctl); - curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, rpc); + curl_easy_setopt(slot->curl, CURLOPT_SEEKFUNCTION, rpc_seek); + curl_easy_setopt(slot->curl, CURLOPT_SEEKDATA, rpc); if (options.verbosity > 1) { fprintf(stderr, "POST %s (chunked)\n", rpc->service_name); fflush(stderr); base-commit: a7caae2729742fc80147bca1c02ae848cb55921a
-- gitgitgadget
