wt/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2026-09-30 20:52:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'no TLS' problem with RequestWithoutContentLengthOrTransferEncoding

Browse Source
This commit is contained in:
yhirose
2026-02-10 23:21:43 -10:00
parent 1f1a799d13
commit 02e4c53685
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
httplib.h
+18 -13
View File
@@ -9869,20 +9869,25 @@ inline bool Server::read_content_core(
payload_max_length_ < (std::numeric_limits<size_t>::max)()) {
socket_t s = strm.socket();
if (s != INVALID_SOCKET) {
// Peek to check if there is any pending data
char peekbuf[1];
ssize_t n = ::recv(s, peekbuf, 1, MSG_PEEK);
if (n > 0) {
// There is data, so read it with payload limit enforcement
auto result = detail::read_content_without_length(
strm, payload_max_length_, out);
if (result == detail::ReadContentResult::PayloadTooLarge) {
res.status = StatusCode::PayloadTooLarge_413;
return false;
} else if (result != detail::ReadContentResult::Success) {
return false;
// Use a non-blocking check to see if there is any pending data.
// A blocking recv(MSG_PEEK) would deadlock when the client is
// waiting for the response (e.g. POST with Connection: close and
// no body).
if (detail::select_read(s, 0, 0) > 0) {
char peekbuf[1];
ssize_t n = ::recv(s, peekbuf, 1, MSG_PEEK);
if (n > 0) {
// There is data, so read it with payload limit enforcement
auto result = detail::read_content_without_length(
strm, payload_max_length_, out);
if (result == detail::ReadContentResult::PayloadTooLarge) {
res.status = StatusCode::PayloadTooLarge_413;
return false;
} else if (result != detail::ReadContentResult::Success) {
return false;
}
return true;
}
return true;
}
}
}
justfile
+3
View File
@@ -13,6 +13,9 @@ mbedtls:
@(cd test && make test_mbedtls && LSAN_OPTIONS=suppressions=lsan_suppressions.txt ./test_mbedtls)
@(cd test && make proxy_mbedtls)
no_tls:
@(cd test && make test_no_tls && ./test_no_tls)
fuzz:
@(cd test && make fuzz_test)