Revert "urldata: move async resolver state from easy handle to connectdata" #12524
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bagder
force-pushed
the
bagder/revert-12521
branch
from
7236796
to
54f89e8
Compare
|
If I had just used my brains a little more earlier, I would've thought about/mentioned this before and probably not merged #12198 |
|
@icing I could use your keen eyes on this. |
|
You threw away the call to diff --git a/lib/url.c b/lib/url.c
index 94999d20b..7764668dc 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3744,6 +3744,11 @@ static CURLcode create_conn(struct Curl_easy *data,
* This is a brand new connection, so let's store it in the connection
* cache of ours!
*/
+ result = Curl_ssl_conn_config_init(data, conn);
+ if(result) {
+ DEBUGF(fprintf(stderr, "Error: init connection ssl config\n"));
+ goto out;
+ }
Curl_attach_connection(data, conn);
result = Curl_conncache_add_conn(data);
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 1f735e001..0f2dc82ad 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -3175,6 +3175,8 @@ static CURLcode populate_x509_store(struct Curl_cfilter *cf,
bool imported_native_ca = false;
bool imported_ca_info_blob = false;
+ CURL_TRC_CF(data, cf, "populate_x509_store, path=%s, blob=%d",
+ ssl_cafile? ssl_cafile : "none", !!ca_info_blob);
if(!store)
return CURLE_OUT_OF_MEMORY;
|
|
oops, thank you! |
icing
approved these changes
Dec 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 56a4db2 (#12198)
We want the c-ares channel to be held in the easy handle, not per connection - for performance.