romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-25 11:57:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: SSL connection reuse

Browse source 
Protocol handlers not flagging PROTOPT_SSL that allow reuse of existing
SSL connections now need to carry the flag PROTOPT_SSL_REUSE.

Add PROTOPT_SSL_REUSE to imap, ldap, pop3, smtp and ftp.

Add tests the http: urls do not reuse https: connections and vice versa.

Reported-by: Sakthi SK
Fixes #19006
Closes #19007
This commit is contained in:
Stefan Eissing 2025-10-10 14:33:36 +02:00 • committed by Daniel Stenberg
parent dd7762c309
commit 6e35eb4879
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
9 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ftp.c
View file

@ -271,7 +271,7 @@ const struct Curl_handler Curl_handler_ftp = {
CURLPROTO_FTP, /* family */
PROTOPT_DUAL | PROTOPT_CLOSEACTION | PROTOPT_NEEDSPWD |
PROTOPT_NOURLQUERY | PROTOPT_PROXY_AS_HTTP |
PROTOPT_WILDCARD /* flags */
PROTOPT_WILDCARD | PROTOPT_SSL_REUSE /* flags */
};

3
lib/imap.c
View file

@ -209,7 +209,8 @@ const struct Curl_handler Curl_handler_imap = {
CURLPROTO_IMAP, /* protocol */
CURLPROTO_IMAP, /* family */
PROTOPT_CLOSEACTION| /* flags */
PROTOPT_URLOPTIONS
PROTOPT_URLOPTIONS|
PROTOPT_SSL_REUSE
};
#ifdef USE_SSL

2
lib/ldap.c
View file

@ -199,7 +199,7 @@ const struct Curl_handler Curl_handler_ldap = {
PORT_LDAP, /* defport */
CURLPROTO_LDAP, /* protocol */
CURLPROTO_LDAP, /* family */
PROTOPT_NONE /* flags */
PROTOPT_SSL_REUSE /* flags */
};
#ifdef HAVE_LDAP_SSL

2
lib/openldap.c
View file

@ -139,7 +139,7 @@ const struct Curl_handler Curl_handler_ldap = {
PORT_LDAP, /* defport */
CURLPROTO_LDAP, /* protocol */
CURLPROTO_LDAP, /* family */
PROTOPT_NONE /* flags */
PROTOPT_SSL_REUSE /* flags */
};
#ifdef USE_SSL

2
lib/pop3.c
View file

@ -200,7 +200,7 @@ const struct Curl_handler Curl_handler_pop3 = {
CURLPROTO_POP3, /* protocol */
CURLPROTO_POP3, /* family */
PROTOPT_CLOSEACTION | PROTOPT_NOURLQUERY | /* flags */
PROTOPT_URLOPTIONS
PROTOPT_URLOPTIONS | PROTOPT_SSL_REUSE
};
#ifdef USE_SSL

2
lib/smtp.c
View file

@ -205,7 +205,7 @@ const struct Curl_handler Curl_handler_smtp = {
CURLPROTO_SMTP, /* protocol */
CURLPROTO_SMTP, /* family */
PROTOPT_CLOSEACTION | PROTOPT_NOURLQUERY | /* flags */
PROTOPT_URLOPTIONS
PROTOPT_URLOPTIONS | PROTOPT_SSL_REUSE
};
#ifdef USE_SSL

9
lib/url.c
View file

@ -932,15 +932,16 @@ static bool url_match_multiplex_limits(struct connectdata *conn,
static bool url_match_ssl_use(struct connectdata *conn,
struct url_conn_match *m)
{
if(m->needle->handler->flags&PROTOPT_SSL) {
if(m->needle->handler->flags & PROTOPT_SSL) {
/* We are looking for SSL, if `conn` does not do it, not a match. */
if(!Curl_conn_is_ssl(conn, FIRSTSOCKET))
return FALSE;
}
else if(Curl_conn_is_ssl(conn, FIRSTSOCKET)) {
/* We are not *requiring* SSL, however `conn` has it. If the
* protocol *family* is not the same, not a match. */
if(get_protocol_family(conn->handler) != m->needle->handler->protocol)
/* If the protocol does not allow reuse of SSL connections OR
is of another protocol family, not a match. */
if(!(m->needle->handler->flags & PROTOPT_SSL_REUSE) ||
(get_protocol_family(conn->handler) != m->needle->handler->protocol))
return FALSE;
}
return TRUE;

3
lib/urldata.h
View file

@ -578,6 +578,9 @@ struct Curl_handler {
#define PROTOPT_USERPWDCTRL (1<<13) /* Allow "control bytes" (< 32 ASCII) in
username and password */
#define PROTOPT_NOTCPPROXY (1<<14) /* this protocol cannot proxy over TCP */
#define PROTOPT_SSL_REUSE (1<<15) /* this protocol may reuse an existing
SSL connection in the same family
without having PROTOPT_SSL. */
#define CONNCHECK_NONE 0 /* No checks */
#define CONNCHECK_ISDEAD (1<<0) /* Check if the connection is dead. */