]> git.ipfire.org Git - thirdparty/curl.git/commit
lib: transfer origin and proxy handling
authorStefan Eissing <stefan@eissing.org>
Fri, 12 Jun 2026 10:02:08 +0000 (12:02 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 12 Jun 2026 21:52:00 +0000 (23:52 +0200)
commit73daec6620bf9983df89e8df3660bfa3b8fd501d
tree333ec0c001fd649ff48adcebb45b23991b2bf815
parentc951368579c1cb55f10767139e38b272d8721144
lib: transfer origin and proxy handling

Add `data->state.origin` as the origin the transfer is sending the
current request to/gets the response from. Use it for request specific
properties like authentication, hsts and cookie handling, etc.

Unless talking to a forwarding HTTP proxy (e.g. not tunneling),
`data->state.origin` and `conn->origin` are the same.

With a forwarding HTTP proxy in play, `conn->origin` is set to
`conn->http_proxy.peer` and `conn->bits.origin_is_proxy` (a new bit) is
set.

Remove the connection bits, now replaced with:

* `conn->bits.socksproxy` -> `conn->socks_proy.peer`
* `conn->bits.httpproxy` -> `conn->http_proy.peer`
* `conn->bits.proxy` -> `(conn->socks_proy.peer || conn->http_proy.peer`)
* `conn->bits.tunnel_proxy` -> (`conn->http_proy.peer && !conn->bits.origin_is_proxy`)
* `(conn->bits.httpproxy && !conn->bits.tunnel_proxy)` -> `conn->bits.origin_is_proxy`

Rename `noproxy.[ch]` to `proxy.[ch]`. Move the connection proxy setup
code from `url.c` to `proxy.c`.

Remove `data->info.conn_remote_port` as no one uses it.

Add test_40_02b for a SOCKS connection to a forwarding HTTPS proxy.

Update internal documentation about peers and creds.

Closes #21967
30 files changed:
docs/internals/CREDENTIALS.md
docs/internals/PEERS.md
lib/Makefile.inc
lib/cf-ip-happy.c
lib/cf-socket.c
lib/cfilters.c
lib/cfilters.h
lib/connect.c
lib/ftp.c
lib/http.c
lib/http2.c
lib/http_aws_sigv4.c
lib/http_digest.c
lib/http_negotiate.c
lib/http_ntlm.c
lib/http_proxy.c
lib/http_proxy.h
lib/noproxy.c [deleted file]
lib/peer.c
lib/proxy.c [new file with mode: 0644]
lib/proxy.h [moved from lib/noproxy.h with 56% similarity]
lib/transfer.c
lib/url.c
lib/urldata.h
lib/vauth/digest.c
lib/vauth/digest_sspi.c
lib/vauth/vauth.c
lib/vquic/vquic.c
tests/http/test_40_socks.py
tests/unit/unit1614.c