eden-emu/cpp-httplib
14
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-15 09:18:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #738

Browse source
This commit is contained in:
yhirose 2020-11-08 18:00:55 -05:00
parent 6613d7b7ad
commit f086bf5310
2 changed files with 68 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

27
httplib.h
View file

@ -692,7 +692,7 @@ private:
const Request &req, Response &res);
bool write_response_core(Stream &strm, bool close_connection,
const Request &req, Response &res,
std::string &content_type, std::string &boundary);
bool need_apply_ranges);
bool write_content_with_provider(Stream &strm, const Request &req,
Response &res, const std::string &boundary,
const std::string &content_type);
@ -3769,7 +3769,8 @@ inline ssize_t SocketStream::read(char *ptr, size_t size) {
}
return recv(sock_, ptr, static_cast<int>(size), CPPHTTPLIB_RECV_FLAGS);
#else
return handle_EINTR([&]() { return recv(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS); });
return handle_EINTR(
[&]() { return recv(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS); });
#endif
}
@ -3782,7 +3783,8 @@ inline ssize_t SocketStream::write(const char *ptr, size_t size) {
}
return send(sock_, ptr, static_cast<int>(size), CPPHTTPLIB_SEND_FLAGS);
#else
return handle_EINTR([&]() { return send(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS); });
return handle_EINTR(
[&]() { return send(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS); });
#endif
}
@ -4022,32 +4024,27 @@ inline bool Server::parse_request_line(const char *s, Request &req) {
inline bool Server::write_response(Stream &strm, bool close_connection,
const Request &req, Response &res) {
std::string content_type;
std::string boundary;
return write_response_core(strm, close_connection, req, res, content_type,
boundary);
return write_response_core(strm, close_connection, req, res, false);
}
inline bool Server::write_response_with_content(Stream &strm,
bool close_connection,
const Request &req,
Response &res) {
std::string content_type;
std::string boundary;
apply_ranges(req, res, content_type, boundary);
return write_response_core(strm, close_connection, req, res, content_type,
boundary);
return write_response_core(strm, close_connection, req, res, true);
}
inline bool Server::write_response_core(Stream &strm, bool close_connection,
const Request &req, Response &res,
std::string &content_type,
std::string &boundary) {
bool need_apply_ranges) {
assert(res.status != -1);
if (400 <= res.status && error_handler_) { error_handler_(req, res); }
std::string content_type;
std::string boundary;
if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); }
// Headers
if (close_connection || req.get_header_value("Connection") == "close") {
res.set_header("Connection", "close");