mirror of
https://github.com/curl/curl.git
synced 2026-06-13 23:15:37 +03:00
73daec6620
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
59 lines
1.9 KiB
C
59 lines
1.9 KiB
C
#ifndef HEADER_CURL_PROXY_H
|
|
#define HEADER_CURL_PROXY_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#ifndef CURL_DISABLE_PROXY
|
|
|
|
struct Curl_easy;
|
|
struct Curl_peer;
|
|
struct Curl_creds;
|
|
struct connectdata;
|
|
|
|
struct proxy_info {
|
|
struct Curl_peer *peer; /* proxy to this peer */
|
|
struct Curl_creds *creds; /* use these credentials, maybe NULL */
|
|
uint8_t proxytype; /* what kind of proxy that is in use */
|
|
};
|
|
|
|
#define CURL_PROXY_IS_HTTPS(t) \
|
|
(((t) == CURLPROXY_HTTPS) || \
|
|
((t) == CURLPROXY_HTTPS2) || \
|
|
((t) == CURLPROXY_HTTPS3))
|
|
|
|
#define CURL_PROXY_IS_HTTP(t) \
|
|
(((t) == CURLPROXY_HTTP) || \
|
|
((t) == CURLPROXY_HTTP_1_0))
|
|
|
|
#define CURL_PROXY_IS_ANY_HTTP(t) \
|
|
(CURL_PROXY_IS_HTTP(t) || \
|
|
CURL_PROXY_IS_HTTPS(t))
|
|
|
|
CURLcode Curl_proxy_init_conn(struct Curl_easy *data,
|
|
struct connectdata *conn);
|
|
|
|
#endif /* !CURL_DISABLE_PROXY */
|
|
|
|
#endif /* HEADER_CURL_PROXY_H */
|