@@ -879,7 +879,7 @@ index 03d676df0..476216312 100644
879879 }
880880 #endif
881881diff --git a/lib/http.c b/lib/http.c
882- index 5942d313b..60ea7951b 100644
882+ index 5942d313b..595c0b809 100644
883883--- a/lib/http.c
884884+++ b/lib/http.c
885885@@ -85,6 +85,7 @@
@@ -1045,7 +1045,15 @@ index 5942d313b..60ea7951b 100644
10451045 static CURLcode http_useragent(struct Curl_easy *data)
10461046 {
10471047 /* The User-Agent string might have been allocated in url.c already, because
1048- @@ -2715,6 +2829,11 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
1048+ @@ -2669,7 +2783,6 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
1049+ const char *httpstring;
1050+ struct dynbuf req;
1051+ char *altused = NULL;
1052+ - const char *p_accept; /* Accept: string */
1053+ unsigned char httpversion;
1054+
1055+ /* Always consider the DO phase done after this function call, even if there
1056+ @@ -2715,6 +2828,11 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
10491057 if(result)
10501058 goto fail;
10511059
@@ -1057,7 +1065,26 @@ index 5942d313b..60ea7951b 100644
10571065 result = http_host(data, conn);
10581066 if(result)
10591067 goto fail;
1060- @@ -4509,6 +4628,29 @@ static bool http_TE_has_token(const char *fvalue, const char *token)
1068+ @@ -2772,9 +2890,6 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
1069+ if(result)
1070+ goto fail;
1071+
1072+ - p_accept = Curl_checkheaders(data,
1073+ - STRCONST("Accept")) ? NULL : "Accept: */*\r\n";
1074+ -
1075+ result = http_range(data, httpreq);
1076+ if(result)
1077+ goto fail;
1078+ @@ -2837,7 +2952,7 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done)
1079+ *data->set.str[STRING_USERAGENT] &&
1080+ data->state.aptr.uagent) ?
1081+ data->state.aptr.uagent : "",
1082+ - p_accept ? p_accept : "",
1083+ + "", // Accept
1084+ data->state.aptr.te ? data->state.aptr.te : "",
1085+ (data->set.str[STRING_ENCODING] &&
1086+ *data->set.str[STRING_ENCODING] &&
1087+ @@ -4509,6 +4624,29 @@ static bool http_TE_has_token(const char *fvalue, const char *token)
10611088 return FALSE;
10621089 }
10631090
@@ -1087,7 +1114,7 @@ index 5942d313b..60ea7951b 100644
10871114 CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
10881115 struct httpreq *req, struct Curl_easy *data)
10891116 {
1090- @@ -4517,6 +4659 ,10 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
1117+ @@ -4517,6 +4655 ,10 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
10911118 size_t i;
10921119 CURLcode result;
10931120
@@ -1098,7 +1125,7 @@ index 5942d313b..60ea7951b 100644
10981125 DEBUGASSERT(req);
10991126 DEBUGASSERT(h2_headers);
11001127
1101- @@ -4547,20 +4693 ,42 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
1128+ @@ -4547,20 +4689 ,42 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
11021129
11031130 Curl_dynhds_reset(h2_headers);
11041131 Curl_dynhds_set_opts(h2_headers, DYNHDS_OPT_LOWERCASE);
@@ -1153,7 +1180,7 @@ index 5942d313b..60ea7951b 100644
11531180 for(i = 0; !result && i < Curl_dynhds_count(&req->headers); ++i) {
11541181 e = Curl_dynhds_getn(&req->headers, i);
11551182 /* "TE" is special in that it is only permissible when it
1156- @@ -4573,6 +4741 ,8 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
1183+ @@ -4573,6 +4737 ,8 @@ CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
11571184 else if(h2_permissible_field(e)) {
11581185 result = Curl_dynhds_add(h2_headers, e->name, e->namelen,
11591186 e->value, e->valuelen);
0 commit comments