<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b4af50d2f9de13cf4153a3f241aa826954b70b31">https://github.com/macports/macports-ports/commit/b4af50d2f9de13cf4153a3f241aa826954b70b31</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b4af50d2f9d curl: Update to 8.12.1
</span>b4af50d2f9d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b4af50d2f9de13cf4153a3f241aa826954b70b31
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Mar 9 00:57:57 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> curl: Update to 8.12.1
</span>---
net/curl/Portfile | 12 ++--
net/curl/files/managen.patch | 64 ++++++++++++++++++++
net/curl/files/ssl-crash.patch | 134 -----------------------------------------
3 files changed, 70 insertions(+), 140 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 232dd9af8cf..c5d38795778 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,10 @@ PortGroup clang_dependency 1.0
</span> # Increase the revision of p5-www-curl whenever the version of curl gets updated.
name curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.12.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a5c5819cb487c809e43c4708d3bbc5d80d0aa170 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2777552
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.12.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c29a185531db8a3983ff146e1b682ee408b0b257 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2768160
</span>
categories net www
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,13 +35,13 @@ checksums-prepend ${curl_distfile}
</span> if {${name} eq ${subport}} {
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
depends_build path:bin/pkg-config:pkgconfig
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append ssl-crash.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append managen.patch
</span>
configure.args --disable-silent-rules \
--enable-ipv6 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/managen.patch b/net/curl/files/managen.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6fb3394163e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/files/managen.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+managen: correct the warning for un-escaped '<' and '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1. make sure the check is done before the backticks are replaced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2. ignore less-than and greater-than used within backticks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(adjust proxy.md that now showed a two-space warning)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/curl/curl/commit/c561c94ec3e2259b023c228e3b0c5244c27bcdd3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- docs/cmdline-opts/proxy.md.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ docs/cmdline-opts/proxy.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@ Use the specified proxy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The proxy string can be specified with a protocol:// prefix. No protocol
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specified or http:// it is treated as an HTTP proxy. Use socks4://,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ socks4a://, socks5:// or socks5h:// to request a specific SOCKS version to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-used. (Added in 7.21.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++used. (Added in 7.21.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Unix domain sockets are supported for socks proxy. Set localhost for the host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ part. e.g. socks5h://localhost/path/to/socket.sock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/managen.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/managen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -391,6 +391,23 @@ sub render {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $d =~ s/`%VERSION`/$version/g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $d =~ s/`%GLOBALS`/$globals/g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!$quote) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if($d =~ /^(.*) /) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf STDERR "$f:$line:%d:ERROR: 2 spaces detected\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ length($1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $back = $d;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # remove all backticked pieces
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $back =~ s/\`(.*?)\`//g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if($back =~ /[^\\][\<\>]/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print STDERR "$f:$line:1:WARN: un-escaped < or > used: $back\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # convert backticks to double quotes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $d =~ s/\`/\"/g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,17 +427,6 @@ sub render {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(!$quote) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if($d =~ /^(.*) /) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf STDERR "$f:$line:%d:ERROR: 2 spaces detected\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- length($1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elsif($d =~ /[^\\][\<\>]/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print STDERR "$f:$line:1:WARN: un-escaped < or > used\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # convert backslash-'<' or '> to just the second character
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $d =~ s/\\([><])/$1/g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # convert single backslash to double-backslash
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/files/ssl-crash.patch b/net/curl/files/ssl-crash.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eaaf5de0c3d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/files/ssl-crash.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,134 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix a runtime crash in some SSL codepaths. Will be in next release after 8.12.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/curl/curl/issues/16236#issuecomment-2645385845
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/setopt.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/setopt.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1584,10 +1584,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(data->share->hsts == data->hsts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->hsts = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef USE_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(data->share->ssl_scache == data->state.ssl_scache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- data->state.ssl_scache = data->multi ? data->multi->ssl_scache : NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_LIBPSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(data->psl == &data->share->psl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->psl = data->multi ? &data->multi->psl : NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1628,10 +1624,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->hsts = data->share->hsts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef USE_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(data->share->ssl_scache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- data->state.ssl_scache = data->share->ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_LIBPSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(data->share->specifier & (1 << CURL_LOCK_DATA_PSL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->psl = &data->share->psl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/transfer.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/transfer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -567,12 +567,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->state.httpreq = data->set.method;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef USE_SSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!data->state.ssl_scache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* There was no ssl session cache set via a share, use the multi one */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- data->state.ssl_scache = data->multi->ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->state.requests = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->state.followlocation = 0; /* reset the location-follow counter */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data->state.this_is_a_follow = FALSE; /* reset this */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/urldata.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/urldata.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1199,7 +1199,6 @@ struct UrlState {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl_prot_t first_remote_protocol;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int retrycount; /* number of retries on a new connection */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *ssl_scache; /* TLS session pool */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int os_errno; /* filled in with errno whenever an error occurs */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long followlocation; /* redirect counter */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int requests; /* request counter: redirects + authentication retakes */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/vtls/vtls_scache.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/vtls/vtls_scache.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,6 +82,17 @@ struct Curl_ssl_scache {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long age;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static struct Curl_ssl_scache *cf_ssl_scache_get(struct Curl_easy *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* If a share is present, its ssl_scache has preference over the multi */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(data->share && data->share->ssl_scache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ scache = data->share->ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if(data->multi && data->multi->ssl_scache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ scache = data->multi->ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void cf_ssl_scache_clear_session(struct Curl_ssl_session *s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(s->sdata) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -792,7 +803,7 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *ssl_peer_key,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_session *s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUGASSERT(ssl_config);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -826,7 +837,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *ssl_peer_key,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_session **ps)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_scache_peer *peer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_llist_node *n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -870,7 +881,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *sobj,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Curl_ssl_scache_obj_dtor *sobj_free)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_scache_peer *peer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -898,7 +909,7 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *ssl_peer_key,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void **sobj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_scache_peer *peer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -924,7 +935,7 @@ void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_easy *data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *ssl_peer_key)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_scache_peer *peer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CURLcode result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1021,7 +1032,7 @@ CURLcode Curl_ssl_session_import(struct Curl_easy *data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned char *shmac, size_t shmac_len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned char *sdata, size_t sdata_len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_scache_peer *peer = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_session *s = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool locked = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1092,7 +1103,7 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl_ssls_export_cb *export_fn,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *userptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct Curl_ssl_scache *scache = data->state.ssl_scache;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_ssl_scache_peer *peer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct dynbuf sbuf, hbuf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct Curl_llist_node *n;
</span></pre><pre style='margin:0'>
</pre>