lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Fix #1481

Browse Source
This commit is contained in:
yhirose 2023-03-04 18:08:18 -05:00
parent ba5884e779
commit c7e959a948
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
httplib.h
View File

@ -854,6 +854,9 @@ enum class Error {
UnsupportedMultipartBoundaryChars, UnsupportedMultipartBoundaryChars,
Compression, Compression,
ConnectionTimeout, ConnectionTimeout,
// For internal use only
SSLPeerCouldBeClosed_,
}; };
std::string to_string(const Error error); std::string to_string(const Error error);
@ -1126,8 +1129,6 @@ protected:
bool is_open() const { return sock != INVALID_SOCKET; } bool is_open() const { return sock != INVALID_SOCKET; }
}; };
Result send_(Request &&req);
virtual bool create_and_connect_socket(Socket &socket, Error &error); virtual bool create_and_connect_socket(Socket &socket, Error &error);
// All of: // All of:
@ -1228,6 +1229,9 @@ protected:
Logger logger_; Logger logger_;
private: private:
bool send_(Request &req, Response &res, Error &error);
Result send_(Request &&req);
socket_t create_client_socket(Error &error) const; socket_t create_client_socket(Error &error) const;
bool read_response_line(Stream &strm, const Request &req, Response &res); bool read_response_line(Stream &strm, const Request &req, Response &res);
bool write_request(Stream &strm, Request &req, bool close_connection, bool write_request(Stream &strm, Request &req, bool close_connection,
@ -6278,7 +6282,15 @@ inline bool ClientImpl::read_response_line(Stream &strm, const Request &req,
inline bool ClientImpl::send(Request &req, Response &res, Error &error) { inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_); std::lock_guard<std::recursive_mutex> request_mutex_guard(request_mutex_);
auto ret = send_(req, res, error);
if (error == Error::SSLPeerCouldBeClosed_) {
assert(!ret);
ret = send_(req, res, error);
}
return ret;
}
inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
{ {
std::lock_guard<std::mutex> guard(socket_mutex_); std::lock_guard<std::mutex> guard(socket_mutex_);
@ -6289,13 +6301,6 @@ inline bool ClientImpl::send(Request &req, Response &res, Error &error) {
auto is_alive = false; auto is_alive = false;
if (socket_.is_open()) { if (socket_.is_open()) {
is_alive = detail::is_socket_alive(socket_.sock); is_alive = detail::is_socket_alive(socket_.sock);
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
if (is_ssl() && is_alive) {
char buf[1];
auto n = SSL_peek(socket_.ssl, buf, 1);
if (n <= 0) { is_alive = false; }
}
#endif
if (!is_alive) { if (!is_alive) {
// Attempt to avoid sigpipe by shutting down nongracefully if it seems // Attempt to avoid sigpipe by shutting down nongracefully if it seems
// like the other side has already closed the connection Also, there // like the other side has already closed the connection Also, there
@ -6757,6 +6762,16 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,
// Send request // Send request
if (!write_request(strm, req, close_connection, error)) { return false; } if (!write_request(strm, req, close_connection, error)) { return false; }
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
if (is_ssl()) {
char buf[1];
if (SSL_peek(socket_.ssl, buf, 1) == 0) {
error = Error::SSLPeerCouldBeClosed_;
return false;
}
}
#endif
// Receive response and headers // Receive response and headers
if (!read_response_line(strm, req, res) || if (!read_response_line(strm, req, res) ||
!detail::read_headers(strm, res.headers)) { !detail::read_headers(strm, res.headers)) {

14
test/test.cc
View File

@ -4114,15 +4114,23 @@ TEST(KeepAliveTest, SSLClientReconnection) {
ASSERT_TRUE(result); ASSERT_TRUE(result);
EXPECT_EQ(200, result->status); EXPECT_EQ(200, result->status);
result = cli.Get("/hi");
ASSERT_TRUE(result);
EXPECT_EQ(200, result->status);
std::this_thread::sleep_for(std::chrono::seconds(2)); std::this_thread::sleep_for(std::chrono::seconds(2));
// Recoonect
result = cli.Get("/hi"); result = cli.Get("/hi");
ASSERT_TRUE(result);
EXPECT_EQ(200, result->status);
result = cli.Get("/hi");
ASSERT_TRUE(result);
EXPECT_EQ(200, result->status);
svr.stop(); svr.stop();
f.wait(); f.wait();
ASSERT_TRUE(result);
EXPECT_EQ(200, result->status);
} }
#endif #endif