curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-07 21:05:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

altsvc: accept 'clear' without semicolon as well

Browse Source 
Extend test 1654 to verify

Fixes #17917
Reported-by: Luke Wilde
Closes #17918
This commit is contained in:
Daniel Stenberg 2025-07-13 16:32:55 +02:00
parent 9bdd08b3b2
commit 826a32dff3
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/altsvc.c
View File

@ -486,8 +486,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
DEBUGASSERT(asi); DEBUGASSERT(asi);
/* initial check for "clear" */ /* initial check for "clear" */
if(!curlx_str_until(&p, &alpn, MAX_ALTSVC_LINE, ';') && if(!curlx_str_cspn(&p, &alpn, ";\n\r")) {
!curlx_str_single(&p, ';')) {
curlx_str_trimblanks(&alpn); curlx_str_trimblanks(&alpn);
/* "clear" is a magic keyword */ /* "clear" is a magic keyword */
if(curlx_str_casecompare(&alpn, "clear")) { if(curlx_str_casecompare(&alpn, "clear")) {

14
tests/unit/unit1654.c
View File

@ -95,6 +95,20 @@ static CURLcode test_unit1654(char *arg)
fail_if(result, "Curl_altsvc_parse(7) failed!"); fail_if(result, "Curl_altsvc_parse(7) failed!");
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries"); fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
result =
Curl_altsvc_parse(curl, asi,
"h2=\":443\", h3=\":443\"; "
"persist = \"1\"; ma = 120;\r\n",
ALPN_h1, "curl.se", 80);
fail_if(result, "Curl_altsvc_parse(6) failed!");
fail_unless(Curl_llist_count(&asi->list) == 12, "wrong number of entries");
/* clear - without semicolon */
result = Curl_altsvc_parse(curl, asi, "clear\r\n",
ALPN_h1, "curl.se", 80);
fail_if(result, "Curl_altsvc_parse(7) failed!");
fail_unless(Curl_llist_count(&asi->list) == 10, "wrong number of entries");
/* only a non-existing alpn */ /* only a non-existing alpn */
result = Curl_altsvc_parse(curl, asi, result = Curl_altsvc_parse(curl, asi,
"h6=\"example.net:443\"; ma=\"180\";\r\n", "h6=\"example.net:443\"; ma=\"180\";\r\n",