Skip to content

Commit 0fa3c9a

Browse files
committed
curl.patch: apply upstream patch [ci skip]
Ref: curl/curl#18019 curl/curl@1055144 https://github.com/curl/curl/commit/1055144063ca5f8c67ae6b7d727f76c9bdad88ba.diff To fix: ``` /home/appveyor/projects/curl-for-win/curl/lib/vquic/curl_ngtcp2.c:836:1: warning: missing field 'begin_path_validation' initializer [-Wmissing-field-initializers] 836 | }; | ^ /home/appveyor/projects/curl-for-win/curl/lib/vquic/curl_ngtcp2.c:1186:1: warning: missing field 'recv_origin' initializer [-Wmissing-field-initializers] 1186 | }; | ^ 2 warnings generated. ``` Ref: https://ci.appveyor.com/project/curlorg/curl-for-win/builds/52462852#L14821
1 parent f45df09 commit 0fa3c9a

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

curl.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,31 @@ index 2ceca242b651..8268d0a1a3c6 100644
1111
#if defined(_WIN32) && !defined(CURL_WINDOWS_UWP) && !defined(UNDER_CE)
1212
rc = recv(per->infd, buffer, curlx_uztosi(sz * nmemb), 0);
1313
if(rc < 0) {
14+
diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
15+
index 2cda65aa03f1..052f280afc15 100644
16+
--- a/lib/vquic/curl_ngtcp2.c
17+
+++ b/lib/vquic/curl_ngtcp2.c
18+
@@ -833,6 +833,9 @@ static ngtcp2_callbacks ng_callbacks = {
19+
cb_recv_rx_key,
20+
NULL, /* recv_tx_key */
21+
NULL, /* early_data_rejected */
22+
+#ifdef NGTCP2_CALLBACKS_V2
23+
+ NULL, /* begin_path_validation */
24+
+#endif
25+
};
26+
27+
#if defined(_MSC_VER) && defined(_DLL)
28+
@@ -1182,7 +1185,12 @@ static nghttp3_callbacks ngh3_callbacks = {
29+
NULL, /* end_stream */
30+
cb_h3_reset_stream,
31+
NULL, /* shutdown */
32+
- NULL /* recv_settings */
33+
+ NULL, /* recv_settings */
34+
+#ifdef NGHTTP3_CALLBACKS_V2
35+
+ NULL, /* recv_origin */
36+
+ NULL, /* end_origin */
37+
+ NULL, /* rand */
38+
+#endif
39+
};
40+
41+
static CURLcode init_ngh3_conn(struct Curl_cfilter *cf,

0 commit comments

Comments
 (0)