Fix #2217 #2218
Closed
Fix #2217 #2218
+47
−5
Conversation
This file contains hidden or 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
|
@JakubHazik thanks for the pull request. Could you take a look at the GitHub Actions workflow failures and compiler warnings? (You don't need to worry about the |
yhirose
reviewed
Aug 26, 2025
| @@ -1546,7 +1546,7 @@ class ClientImpl { | |||
| #ifdef CPPHTTPLIB_OPENSSL_SUPPORT | |||
| void set_ca_cert_path(const std::string &ca_cert_file_path, | |||
| const std::string &ca_cert_dir_path = std::string()); | |||
| void set_ca_cert_store(X509_STORE *ca_cert_store); | |||
| virtual void set_ca_cert_store(X509_STORE *ca_cert_store); | |||
There was a problem hiding this comment.
Could you please remove virtual. It's not necessary.
yhirose
reviewed
Aug 26, 2025
| @@ -11857,7 +11860,7 @@ inline void Client::set_ca_cert_path(const std::string &ca_cert_file_path, | |||
|
|
|||
| inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) { | |||
| if (is_ssl_) { | |||
| static_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store); | |||
| dynamic_cast<SSLClient &>(*cli_).set_ca_cert_store(ca_cert_store); | |||
There was a problem hiding this comment.
Could you please revert it to static_cast?
yhirose
reviewed
Aug 26, 2025
| @@ -11869,13 +11872,13 @@ inline void Client::load_ca_cert_store(const char *ca_cert, std::size_t size) { | |||
|
|
|||
| inline long Client::get_openssl_verify_result() const { | |||
| if (is_ssl_) { | |||
| return static_cast<SSLClient &>(*cli_).get_openssl_verify_result(); | |||
| return dynamic_cast<SSLClient &>(*cli_).get_openssl_verify_result(); | |||
There was a problem hiding this comment.
Could you please revert it to static_cast, too?
yhirose
reviewed
Aug 26, 2025
| } | ||
| return -1; // NOTE: -1 doesn't match any of X509_V_ERR_??? | ||
| } | ||
|
|
||
| inline SSL_CTX *Client::ssl_context() const { | ||
| if (is_ssl_) { return static_cast<SSLClient &>(*cli_).ssl_context(); } | ||
| if (is_ssl_) { return dynamic_cast<SSLClient &>(*cli_).ssl_context(); } |
There was a problem hiding this comment.
Could you please revert it to static_cast, too?
|
@JakubHazik I made come comments. After the adjustments are made, could you please run clang-format, so that |
|
I made the adjustments for you at eb5a65e. :) |
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.
Try resolve #2217
Transmit X509_STORE between SSLClient-s during redirect.
Make variable
ca_cert_store_reusable between multiple clients