diff options
author | Stefan Eissing <stefan@eissing.org> | 2023-04-06 09:54:57 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2023-04-06 13:04:46 +0200 |
commit | 4ae2d9f24d3ba506f828df69357ac80b346348de (patch) | |
tree | b4c9d1866849d2707dff6532316cf04bb1ec0397 /lib/urldata.h | |
parent | 8f50e393ab0d2305cb5fc1aa4b47fd9d83f415dc (diff) | |
download | curl-4ae2d9f24d3ba506f828df69357ac80b346348de.tar.gz |
proxy: http2 proxy tunnel implementation
- currently only on debug build and when env variable
CURL_PROXY_TUNNEL_H2 is present.
- will ALPN negotiate with the proxy server and switch
tunnel filter based on the protocol negotiated.
- http/1.1 tunnel code moved into cf-h1-proxy.[ch]
- http/2 tunnel code implemented in cf-h2-proxy.[ch]
- tunnel start and ALPN set remains in http_proxy.c
- moving all haproxy related code into cf-haproxy.[ch]
VTLS changes
- SSL filters rely solely on the "alpn" specification they
are created with and no longer check conn->bits.tls_enable_alpn.
- checks on which ALPN specification to use (or none at all) are
done in vtls.c when creating the filter.
Testing
- added a nghttpx forward proxy to the pytest setup that
speaks HTTP/2 and forwards all requests to the Apache httpd
forward proxy server.
- extending test coverage in test_10 cases
- adding proxy tests for direct/tunnel h1/h2 use of basic auth.
- adding test for http/1.1 and h2 proxy tunneling to pytest
Closes #10780
Diffstat (limited to 'lib/urldata.h')
-rw-r--r-- | lib/urldata.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index 15b285c09..cca992a02 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -134,6 +134,7 @@ typedef unsigned int curl_prot_t; #include "hash.h" #include "splay.h" #include "dynbuf.h" +#include "dynhds.h" /* return the count of bytes sent, or -1 on error */ typedef ssize_t (Curl_send)(struct Curl_easy *data, /* transfer */ @@ -1066,6 +1067,9 @@ struct connectdata { (ftp) */ unsigned char alpn; /* APLN TLS negotiated protocol, a CURL_HTTP_VERSION* value */ +#ifndef CURL_DISABLE_PROXY + unsigned char proxy_alpn; /* APLN of proxy tunnel, CURL_HTTP_VERSION* */ +#endif unsigned char transport; /* one of the TRNSPRT_* defines */ unsigned char ip_version; /* copied from the Curl_easy at creation time */ unsigned char httpversion; /* the HTTP version*10 reported by the server */ |