curl: resolve deprecated curl declarations
PATCH 1/1 curl: resolve deprecated curl declarations
From: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v1
Pull-Request: https://github.com/git/git/pull/1435
git-curl-compat.h | 8 +++++ http-push.c | 6 ++-- http.c | 74 ++++++++++++++++++++++++++++++++++++++--------- http.h | 2 +- remote-curl.c | 28 +++++++----------- 5 files changed, 83 insertions(+), 35 deletions(-)
git-curl-compat.h +8 -0
@@ -127,3 +127,11 @@#endif #endif + +/** +* CURLOPT_REDIR_PROTOCOLS_STR was added in 7.83.0, released in August +* 2022. +*/ +#if LIBCURL_VERSION_NUM >=0x075500 +#define GIT_CURL_HAVE_OPT_REDIR_PROTOCOLS_STR 1 +#endif
http-push.c +3 -3
@@ -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 , ioctl_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);
http.c +61 -13
111 lines not on this page · raw message
http.h +1 -1
@@ -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 ioctl_buffer (void *userp,curl_off_t offset,int origin);/* Slot lifecycle functions */ struct active_request_slot *get_active_slot (void );
remote-curl.c +10 -18
@@ -717,25 +717,17 @@ 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_ioctl (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 ; - -case CURLIOCMD_RESTARTREAD : -if (rpc->initial_buffer) { - rpc->pos =0 ; -return CURLIOE_OK ; - } -error (_ ("unable to rewind rpc post data - try increasing http.postBuffer" )); -return CURLIOE_FAILRESTART ; - -default : -return CURLIOE_UNKNOWNCMD ; +if (rpc->initial_buffer) { + rpc->pos =0 ; +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 +951,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_ioctl); +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
Signature · 1 line
gitgitgadget
PATCH v2 1/1 curl: resolve deprecated curl declarations
From: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v2
Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v1:
1: d84e7e003da ! 1: c40fb2de13d curl: resolve deprecated curl declarations
@@ git-curl-compat.h
#endif
+
+/**
-+ * CURLOPT_REDIR_PROTOCOLS_STR was added in 7.83.0, released in August
++ * CURLOPT_PROTOCOLS_STR was added in 7.83.0, released in August
+ * 2022.
+ */
+#if LIBCURL_VERSION_NUM >= 0x075500
-+#define GIT_CURL_HAVE_OPT_REDIR_PROTOCOLS_STR 1
++#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1
+#endif
## http-push.c ##
@@ http.c: 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_OPT_REDIR_PROTOCOLS_STR
++#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
+static void get_curl_allowed_protocols(int from_user, char *protocol)
+{
+ unsigned int i = 0;
@@ http.c: static int get_curl_http_version_opt(const char *version_string, long *o
static CURL *get_curl_handle(void)
{
CURL *result = curl_easy_init();
-+#ifdef GIT_CURL_HAVE_OPT_REDIR_PROTOCOLS_STR
++#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
+ static char protocol[20], redir_protocol[20];
+#endif
@@ 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_OPT_REDIR_PROTOCOLS_STR
++#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
+ get_curl_allowed_protocols(0, redir_protocol);
+ curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, redir_protocol);
+ get_curl_allowed_protocols(-1, protocol);git-curl-compat.h | 8 +++++ http-push.c | 6 ++-- http.c | 74 ++++++++++++++++++++++++++++++++++++++--------- http.h | 2 +- remote-curl.c | 28 +++++++----------- 5 files changed, 83 insertions(+), 35 deletions(-)
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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 , ioctl_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);
http.c +61 -13
111 lines not on this page · raw message
http.h +1 -1
@@ -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 ioctl_buffer (void *userp,curl_off_t offset,int origin);/* Slot lifecycle functions */ struct active_request_slot *get_active_slot (void );
remote-curl.c +10 -18
@@ -717,25 +717,17 @@ 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_ioctl (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 ; - -case CURLIOCMD_RESTARTREAD : -if (rpc->initial_buffer) { - rpc->pos =0 ; -return CURLIOE_OK ; - } -error (_ ("unable to rewind rpc post data - try increasing http.postBuffer" )); -return CURLIOE_FAILRESTART ; - -default : -return CURLIOE_UNKNOWNCMD ; +if (rpc->initial_buffer) { + rpc->pos =0 ; +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 +951,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_ioctl); +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
Signature · 1 line
gitgitgadget
PATCH v3 1/1 curl: resolve deprecated curl declarations
From: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v3
Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v2:
1: c40fb2de13d ! 1: 14ca56fe608 curl: resolve deprecated curl declarations
@@ Commit message
Signed-off-by: Seija Kijin <[email protected]>
+ ## INSTALL ##
+@@ INSTALL: 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.
+
+
## git-curl-compat.h ##
@@
#endif
@@ http-push.c: static void curl_setup_http(CURL *curl, const char *url,
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, ioctl_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);
## http.c ##
+@@ http.c: static const char *http_proxy_ssl_ca_info;
+ static struct credential proxy_cert_auth = CREDENTIAL_INIT;
+ static int proxy_ssl_cert_password_required;
+
++#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
++static char protocol_list[20];
++#endif
++
+ static struct {
+ const char *name;
+ long curlauth_param;
@@ http.c: 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 ioctl_buffer(void *userp, curl_off_t offset, int origin)
++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;
@@ http.c: size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffe
- case CURLIOCMD_RESTARTREAD:
- buffer->posn = 0;
- return CURLIOE_OK;
--
++ struct buffer *buffer = userp;
+
- default:
- return CURLIOE_UNKNOWNCMD;
-- }
-+ buffer->posn = 0;
++ 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;
}
@@ 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(int from_user, char *protocol)
++static void get_curl_allowed_protocols(int from_user)
+{
+ unsigned int i = 0;
-+
+
+ if (is_transport_allowed("http", from_user)) {
-+ protocol[i++] = 'h';
-+ protocol[i++] = 't';
-+ protocol[i++] = 't';
-+ protocol[i++] = 'p';
++ protocol_list[i++] = 'h';
++ protocol_list[i++] = 't';
++ protocol_list[i++] = 't';
++ protocol_list[i++] = 'p';
+ }
+
+ if (is_transport_allowed("https", from_user)) {
+ if (i != 0) {
-+ protocol[i++] = ',';
++ protocol_list[i++] = ',';
+ }
+
-+ protocol[i++] = 'h';
-+ protocol[i++] = 't';
-+ protocol[i++] = 't';
-+ protocol[i++] = 'p';
-+ protocol[i++] = 's';
++ protocol_list[i++] = 'h';
++ protocol_list[i++] = 't';
++ protocol_list[i++] = 't';
++ protocol_list[i++] = 'p';
++ protocol_list[i++] = 's';
+ }
+ if (is_transport_allowed("ftp", from_user)) {
+ if (i != 0) {
-+ protocol[i++] = ',';
++ protocol_list[i++] = ',';
+ }
-
-+ protocol[i++] = 'f';
-+ protocol[i++] = 't';
-+ protocol[i++] = 'p';
++
++ protocol_list[i++] = 'f';
++ protocol_list[i++] = 't';
++ protocol_list[i++] = 'p';
+ }
+ if (is_transport_allowed("ftps", from_user)) {
+ if (i != 0) {
-+ protocol[i++] = ',';
++ protocol_list[i++] = ',';
+ }
+
-+ protocol[i++] = 'f';
-+ protocol[i++] = 't';
-+ protocol[i++] = 'p';
-+ protocol[i++] = 's';
++ protocol_list[i++] = 'f';
++ protocol_list[i++] = 't';
++ protocol_list[i++] = 'p';
++ protocol_list[i++] = 's';
+ }
+
-+ protocol[i] = '\0';
++ protocol_list[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)
- {
- CURL *result = curl_easy_init();
-+#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
-+ static char protocol[20], redir_protocol[20];
-+#endif
-
- if (!result)
- die("curl_easy_init failed");
@@ 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(0, redir_protocol);
++ get_curl_allowed_protocols(0);
+ curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, redir_protocol);
-+ get_curl_allowed_protocols(-1, protocol);
++ get_curl_allowed_protocols(-1);
+ curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, protocol);
+#else
curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
@@ http.h: struct buffer {
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 ioctl_buffer(void *userp, curl_off_t offset, int origin);
++int seek_buffer(void *userp, curl_off_t offset, int origin);
/* Slot lifecycle functions */
struct active_request_slot *get_active_slot(void);
@@ remote-curl.c: static size_t rpc_out(void *ptr, size_t eltsize,
}
-static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
-+static int rpc_ioctl(void *userp, curl_off_t offset, int origin)
++static int rpc_seek(void *userp, curl_off_t offset, int origin)
{
- struct rpc_state *rpc = clientp;
+ struct rpc_state *rpc = userp;
@@ remote-curl.c: static size_t rpc_out(void *ptr, size_t eltsize,
- 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;
-+ if (rpc->initial_buffer) {
-+ rpc->pos = 0;
++ rpc->pos = offset;
+ return CURL_SEEKFUNC_OK;
}
+
@@ remote-curl.c: retry:
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_ioctl);
++ 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);INSTALL | 2 +- git-curl-compat.h | 8 +++++ http-push.c | 6 ++-- http.c | 80 ++++++++++++++++++++++++++++++++++++++++------- http.h | 2 +- remote-curl.c | 31 +++++++++--------- 6 files changed, 96 insertions(+), 33 deletions(-)
INSTALL +1 -1
@@ -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.
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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);
http.c +68 -12
118 lines not on this page · raw message
http.h +1 -1
@@ -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 );
remote-curl.c +15 -16
@@ -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
Signature · 1 line
gitgitgadget
PATCH v4 1/1 curl: resolve deprecated curl declarations
From: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v4
Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v3:
1: 14ca56fe608 ! 1: ebe36ad23fa curl: resolve deprecated curl declarations
@@ http-push.c: static void curl_setup_http(CURL *curl, const char *url,
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
## http.c ##
-@@ http.c: static const char *http_proxy_ssl_ca_info;
- static struct credential proxy_cert_auth = CREDENTIAL_INIT;
- static int proxy_ssl_cert_password_required;
-
-+#ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
-+static char protocol_list[20];
-+#endif
-+
- static struct {
- const char *name;
- long curlauth_param;
@@ http.c: size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
return size / eltsize;
}
@@ http.c: size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffe
+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;
@@ http.c: size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffe
- case CURLIOCMD_RESTARTREAD:
- buffer->posn = 0;
- return CURLIOE_OK;
-+ struct buffer *buffer = userp;
-
+-
- default:
- return CURLIOE_UNKNOWNCMD;
+ if (origin != SEEK_SET)
@@ 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(int from_user)
++static void get_curl_allowed_protocols(char* protocol_buff, int from_user)
+{
+ unsigned int i = 0;
-
++
+ if (is_transport_allowed("http", from_user)) {
-+ protocol_list[i++] = 'h';
-+ protocol_list[i++] = 't';
-+ protocol_list[i++] = 't';
-+ protocol_list[i++] = 'p';
++ protocol_buff[i++] = 'h';
++ protocol_buff[i++] = 't';
++ protocol_buff[i++] = 't';
++ protocol_buff[i++] = 'p';
+ }
+
+ if (is_transport_allowed("https", from_user)) {
+ if (i != 0) {
-+ protocol_list[i++] = ',';
++ protocol_buff[i++] = ',';
+ }
+
-+ protocol_list[i++] = 'h';
-+ protocol_list[i++] = 't';
-+ protocol_list[i++] = 't';
-+ protocol_list[i++] = 'p';
-+ protocol_list[i++] = 's';
++ protocol_buff[i++] = 'h';
++ protocol_buff[i++] = 't';
++ protocol_buff[i++] = 't';
++ protocol_buff[i++] = 'p';
++ protocol_buff[i++] = 's';
+ }
+ if (is_transport_allowed("ftp", from_user)) {
+ if (i != 0) {
-+ protocol_list[i++] = ',';
++ protocol_buff[i++] = ',';
+ }
+
-+ protocol_list[i++] = 'f';
-+ protocol_list[i++] = 't';
-+ protocol_list[i++] = 'p';
++ protocol_buff[i++] = 'f';
++ protocol_buff[i++] = 't';
++ protocol_buff[i++] = 'p';
+ }
+ if (is_transport_allowed("ftps", from_user)) {
+ if (i != 0) {
-+ protocol_list[i++] = ',';
++ protocol_buff[i++] = ',';
+ }
+
-+ protocol_list[i++] = 'f';
-+ protocol_list[i++] = 't';
-+ protocol_list[i++] = 'p';
-+ protocol_list[i++] = 's';
++ protocol_buff[i++] = 'f';
++ protocol_buff[i++] = 't';
++ protocol_buff[i++] = 'p';
++ protocol_buff[i++] = 's';
+ }
-+
-+ protocol_list[i] = '\0';
+
++ 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(0);
-+ curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS_STR, redir_protocol);
-+ get_curl_allowed_protocols(-1);
-+ curl_easy_setopt(result, CURLOPT_PROTOCOLS_STR, protocol);
++ 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);
+#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 | 81 ++++++++++++++++++++++++++++++++++++++++------- http.h | 2 +- remote-curl.c | 31 +++++++++--------- 6 files changed, 97 insertions(+), 33 deletions(-)
INSTALL +1 -1
@@ -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.
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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);
http.c +69 -12
119 lines not on this page · raw message
http.h +1 -1
@@ -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 );
remote-curl.c +15 -16
@@ -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
Signature · 1 line
gitgitgadget
PATCH v6 1/1 curl: resolve deprecated curl declarations
In reply to Rose via GitGitGadgetFrom: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v6
Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v5:
1: c8628c53d22 ! 1: 6b471a867d5 curl: resolve deprecated curl declarations
@@ http.c: void setup_curl_trace(CURL *handle)
+#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, ',');INSTALL | 2 +- git-curl-compat.h | 8 ++++++ http-push.c | 6 ++--- http.c | 63 ++++++++++++++++++++++++++++++++++++++--------- http.h | 2 +- remote-curl.c | 31 +++++++++++------------ 6 files changed, 79 insertions(+), 33 deletions(-)
INSTALL +1 -1
@@ -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.
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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);
http.c +51 -12
95 lines not on this page · raw message
http.h +1 -1
@@ -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 );
remote-curl.c +15 -16
@@ -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
Signature · 1 line
gitgitgadget
PATCH v5 1/1 curl: resolve deprecated curl declarations
In reply to Rose via GitGitGadgetFrom: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-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(-)
INSTALL +1 -1
@@ -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.
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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);
http.c +53 -12
97 lines not on this page · raw message
http.h +1 -1
@@ -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 );
remote-curl.c +15 -16
@@ -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
Signature · 1 line
gitgitgadget
PATCH v7 1/1 curl: resolve deprecated curl declarations
In reply to Rose via GitGitGadgetFrom: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v7
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v7
Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v6:
1: 6b471a867d5 ! 1: 23094afb2e6 curl: resolve deprecated curl declarations
@@ http.c: void setup_curl_trace(CURL *handle)
+ }
+ if (is_transport_allowed("https", from_user)) {
-+ if (proto_buf->len)
-+ strbuf_addch(proto_buf, ',');
-+ strbuf_addstr(proto_buf, "https");
++ strbuf_addstr(proto_buf, proto_buf->len ? "https" : ",https");
+ }
+
+ if (is_transport_allowed("ftp", from_user)) {
-+ if (proto_buf->len)
-+ strbuf_addch(proto_buf, ',');
-+ strbuf_addstr(proto_buf, "ftp");
++ strbuf_addstr(proto_buf, proto_buf->len ? "ftp" : ",ftp");
+ }
+
+ if (is_transport_allowed("ftps", from_user)) {
-+ if (proto_buf->len)
-+ strbuf_addch(proto_buf, ',');
-+ strbuf_addstr(proto_buf, "ftps");
++ strbuf_addstr(proto_buf, proto_buf->len ? "ftps" : ",ftps");
+ }
+}
+#elseINSTALL | 2 +- git-curl-compat.h | 8 +++++++ http-push.c | 6 ++--- http.c | 57 +++++++++++++++++++++++++++++++++++++---------- http.h | 2 +- remote-curl.c | 31 +++++++++++++------------- 6 files changed, 73 insertions(+), 33 deletions(-)
INSTALL +1 -1
@@ -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.
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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);
http.c +45 -12
89 lines not on this page · raw message
http.h +1 -1
@@ -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 );
remote-curl.c +15 -16
@@ -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
Signature · 1 line
gitgitgadget
PATCH v8 1/1 curl: resolve deprecated curl declarations
From: Seija Kijin <[email protected]>
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 <[email protected]>
---
curl: resolve deprecated curl declarations
Fix CI-Alpine build by replacing deprecated declarations with their suggested replacements
Signed-off-by Seija Kijin [email protected]
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v8
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v8
Pull-Request: https://github.com/git/git/pull/1435
Range-diff vs v7:
1: 23094afb2e6 ! 1: 5e44592695e curl: resolve deprecated curl declarations
@@ http.c: void setup_curl_trace(CURL *handle)
+ }
+ if (is_transport_allowed("https", from_user)) {
-+ strbuf_addstr(proto_buf, proto_buf->len ? "https" : ",https");
++ strbuf_addstr(proto_buf, proto_buf->len ? ",https" : "https");
+ }
+
+ if (is_transport_allowed("ftp", from_user)) {
-+ strbuf_addstr(proto_buf, proto_buf->len ? "ftp" : ",ftp");
++ strbuf_addstr(proto_buf, proto_buf->len ? ",ftp" : "ftp");
+ }
+
+ if (is_transport_allowed("ftps", from_user)) {
-+ strbuf_addstr(proto_buf, proto_buf->len ? "ftps" : ",ftps");
++ strbuf_addstr(proto_buf, proto_buf->len ? ",ftps" : "ftps");
+ }
+}
+#elseINSTALL | 2 +- git-curl-compat.h | 8 +++++++ http-push.c | 6 ++--- http.c | 57 +++++++++++++++++++++++++++++++++++++---------- http.h | 2 +- remote-curl.c | 31 +++++++++++++------------- 6 files changed, 73 insertions(+), 33 deletions(-)
INSTALL +1 -1
@@ -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.
git-curl-compat.h +8 -0
@@ -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
http-push.c +3 -3
@@ -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);
http.c +45 -12
89 lines not on this page · raw message
http.h +1 -1
@@ -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 );
remote-curl.c +15 -16
@@ -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
Signature · 1 line
gitgitgadget
Quoted 8 lines · Rose via GitGitGadget
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1435%2FAtariDreams%2Fcurl-v8
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1435/AtariDreams/curl-v8
Pull-Request: https://github.com/git/git/pull/1435Range-diff vs v7:
1:
23094afb2e6! 1:5e44592695ecurl: resolve deprecated curl declarations
...
Please stop throwing in quick succession so many unsolicited iterations of the same topic at the list, before waiting for reviews from others.
I do not mean "after you sent an initial revision out, even if you find problems in it, do not send updates in for a while". I mean "do not send out that initial revision out, before you spend enough time reading it to find these problems in it you found in, like you did in these previous topics."
In other words, reviewing your own patches to carefully find mistakes and correcting them is VERY GOOD, but rather than doing so in public, you can do so in private before sending the patches out to polish them sufficiently so that you won't find more trivial problems [*]. Prepare patches in private and pretend to be a more perfect human with fewer trivial mistakes ;-).
Note. And you shouldn't be offended by me saying "trivial"; they were found by yourself in a few minutes to a few hours after you sent out the previous iteration.
That way, you'd save yourself from public embarrassment and also save reviewer time.
Thanks.
P.S. Doesn't Peff's 3-patch series already solve the same issue this patch is trying to address?