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

doh: send HTTPS RR requests for all HTTP(S) transfers

Browse source 
When enabled in the build.

Update test2100: verify with HTTPS RR included

Adjust runtests and server/disabled.c to include "HTTPSRR" as a feature
in the test suite.

Also, decode the ALPN list in HTTPS records straight into IDs. There's
no point in storing everything in string format. Skip ALPNs we do not
support.

Closes #16007
This commit is contained in:
Daniel Stenberg 2025-01-15 11:04:46 +01:00
parent 5d70a5c5a4
commit bb93536270
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
11 changed files with 94 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/altsvc.c
View file

@ -41,6 +41,7 @@
#include "strdup.h"
#include "inet_pton.h"
#include "strparse.h"
#include "connect.h"
/* The last 3 #include files should be in this order */
#include "curl_printf.h"
@ -54,23 +55,6 @@
#define H3VERSION "h3"
static enum alpnid alpn2alpnid(char *name, size_t len)
{
if(len == 2) {
if(strncasecompare(name, "h1", 2))
return ALPN_h1;
if(strncasecompare(name, "h2", 2))
return ALPN_h2;
if(strncasecompare(name, "h3", 2))
return ALPN_h3;
}
else if(len == 8) {
if(strncasecompare(name, "http/1.1", 8))
return ALPN_h1;
}
return ALPN_none; /* unknown, probably rubbish input */
}
/* Given the ALPN ID, return the name */
const char *Curl_alpnid2str(enum alpnid id)
{
@ -154,8 +138,8 @@ static struct altsvc *altsvc_create(struct Curl_str *srchost,
size_t srcport,
size_t dstport)
{
enum alpnid dstalpnid = alpn2alpnid(dstalpn->str, dstalpn->len);
enum alpnid srcalpnid = alpn2alpnid(srcalpn->str, srcalpn->len);
enum alpnid dstalpnid = Curl_alpn2alpnid(dstalpn->str, dstalpn->len);
enum alpnid srcalpnid = Curl_alpn2alpnid(srcalpn->str, srcalpn->len);
if(!srcalpnid || !dstalpnid)
return NULL;
return altsvc_createid(srchost->str, srchost->len,
@ -537,7 +521,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
do {
if(*p == '=') {
/* [protocol]="[host][:port]" */
enum alpnid dstalpnid = alpn2alpnid(alpnbuf, alpnlen);
enum alpnid dstalpnid = Curl_alpn2alpnid(alpnbuf, alpnlen);
p++;
if(*p == '\"') {
const char *dsthost = "";