romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:31:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

http: use header_has_value() instead of duplicate code

Browse source 
Closes #21302
This commit is contained in:
Daniel Stenberg 2026-04-13 22:30:13 +02:00
parent bcb02fe526
commit def4d8986e
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/http.c
View file

@ -166,17 +166,29 @@ char *Curl_checkProxyheaders(struct Curl_easy *data,
} }
#endif #endif
/* If the header has a value, this function returns TRUE and the value is in
'outp' with blanks trimmed off.
*/
static bool header_has_value(const char **headerp, struct Curl_str *outp)
{
bool value = !curlx_str_cspn(headerp, outp, ";:") &&
(!curlx_str_single(headerp, ':') || !curlx_str_single(headerp, ';'));
if(value) {
curlx_str_untilnl(headerp, outp, MAX_HTTP_RESP_HEADER_SIZE);
curlx_str_trimblanks(outp);
}
return value;
}
static bool http_header_is_empty(const char *header) static bool http_header_is_empty(const char *header)
{ {
struct Curl_str out; struct Curl_str out;
if(!curlx_str_cspn(&header, &out, ";:") && if(header_has_value(&header, &out)) {
(!curlx_str_single(&header, ':') || !curlx_str_single(&header, ';'))) {
curlx_str_untilnl(&header, &out, MAX_HTTP_RESP_HEADER_SIZE);
curlx_str_trimblanks(&out);
return curlx_strlen(&out) == 0; return curlx_strlen(&out) == 0;
} }
return TRUE; /* invalid head format, treat as empty */ return TRUE; /* invalid header format, treat as empty */
} }
/* /*
@ -192,11 +204,7 @@ static CURLcode copy_custom_value(const char *header, char **valp)
struct Curl_str out; struct Curl_str out;
/* find the end of the header name */ /* find the end of the header name */
if(!curlx_str_cspn(&header, &out, ";:") && if(header_has_value(&header, &out)) {
(!curlx_str_single(&header, ':') || !curlx_str_single(&header, ';'))) {
curlx_str_untilnl(&header, &out, MAX_HTTP_RESP_HEADER_SIZE);
curlx_str_trimblanks(&out);
*valp = curlx_memdup0(curlx_str(&out), curlx_strlen(&out)); *valp = curlx_memdup0(curlx_str(&out), curlx_strlen(&out));
if(*valp) if(*valp)
return CURLE_OK; return CURLE_OK;