mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:31:41 +03:00
conncontrol: reuse handling
Add protocol handler flag `PROTOPT_CONN_REUSE` to indicate that the protocol allows reusing connections for other tranfers. Add that to all handlers that support it. Create connections with `conn->bits.close = FALSE` and remove all the `connkeep()` calls in protocol handlers setup/connect implementations. `PROTOPT_CONN_REUSE` assures that the default behaviour applies at the end of a transfer without need to juggle the close bit. `conn->bits.close` now serves as an additional indication that a connection cannot be reused. Only protocol handles that allow reuse need to set it to override the default behaviour. Remove all `connclose()` and `connkeep()` calls from connection filters. Filters should not modify connection flags. They are supposed to run in eyeballing situations where a filter is just one of many determining the outcome. Fix http response header handling to only honour `Connection: close` for HTTP/1.x versions. Closes #19333
This commit is contained in:
parent
a9e7a027ed
commit
feea968512
21 changed files with 93 additions and 114 deletions
11
lib/imap.c
11
lib/imap.c
|
|
@ -210,9 +210,9 @@ const struct Curl_handler Curl_handler_imap = {
|
|||
PORT_IMAP, /* defport */
|
||||
CURLPROTO_IMAP, /* protocol */
|
||||
CURLPROTO_IMAP, /* family */
|
||||
PROTOPT_CLOSEACTION| /* flags */
|
||||
PROTOPT_URLOPTIONS|
|
||||
PROTOPT_SSL_REUSE
|
||||
PROTOPT_CLOSEACTION | /* flags */
|
||||
PROTOPT_URLOPTIONS | PROTOPT_SSL_REUSE |
|
||||
PROTOPT_CONN_REUSE
|
||||
};
|
||||
|
||||
#ifdef USE_SSL
|
||||
|
|
@ -243,7 +243,7 @@ const struct Curl_handler Curl_handler_imaps = {
|
|||
CURLPROTO_IMAPS, /* protocol */
|
||||
CURLPROTO_IMAP, /* family */
|
||||
PROTOPT_CLOSEACTION | PROTOPT_SSL | /* flags */
|
||||
PROTOPT_URLOPTIONS
|
||||
PROTOPT_URLOPTIONS | PROTOPT_CONN_REUSE
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
@ -1680,9 +1680,6 @@ static CURLcode imap_connect(struct Curl_easy *data, bool *done)
|
|||
if(!imapc)
|
||||
return CURLE_FAILED_INIT;
|
||||
|
||||
/* We always support persistent connections in IMAP */
|
||||
connkeep(data->conn, "IMAP default");
|
||||
|
||||
/* Parse the URL options */
|
||||
result = imap_parse_url_options(data->conn, imapc);
|
||||
if(result)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue