jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chunked transfer encoding cleanup

Browse source
This commit is contained in:
eidheim 2017-11-18 09:55:24 +01:00
commit 6d1577ecaa
1 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

72
client_http.hpp
View file

@ -492,8 +492,8 @@ namespace SimpleWeb {
session->callback(session->connection, ec); session->callback(session->connection, ec);
} }
else if((header_it = session->response->header.find("Transfer-Encoding")) != session->response->header.end() && header_it->second == "chunked") { else if((header_it = session->response->header.find("Transfer-Encoding")) != session->response->header.end() && header_it->second == "chunked") {
auto tmp_streambuf = std::make_shared<asio::streambuf>(); auto chunks_streambuf = std::make_shared<asio::streambuf>();
this->read_chunked(session, tmp_streambuf); this->read_chunked_transfer_encoded(session, chunks_streambuf);
} }
else if(session->response->http_version < "1.1" || ((header_it = session->response->header.find("Session")) != session->response->header.end() && header_it->second == "close")) { else if(session->response->http_version < "1.1" || ((header_it = session->response->header.find("Session")) != session->response->header.end() && header_it->second == "close")) {
session->connection->set_timeout(); session->connection->set_timeout();
@ -540,9 +540,9 @@ namespace SimpleWeb {
}); });
} }
void read_chunked(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &tmp_streambuf) { void read_chunked_transfer_encoded(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &chunks_streambuf) {
session->connection->set_timeout(); session->connection->set_timeout();
asio::async_read_until(*session->connection->socket, session->response->streambuf, "\r\n", [this, session, tmp_streambuf](const error_code &ec, size_t bytes_transferred) { asio::async_read_until(*session->connection->socket, session->response->streambuf, "\r\n", [this, session, chunks_streambuf](const error_code &ec, size_t bytes_transferred) {
session->connection->cancel_timeout(); session->connection->cancel_timeout();
auto lock = session->connection->handler_runner->continue_lock(); auto lock = session->connection->handler_runner->continue_lock();
if(!lock) if(!lock)
@ -567,13 +567,39 @@ namespace SimpleWeb {
auto num_additional_bytes = session->response->streambuf.size() - bytes_transferred; auto num_additional_bytes = session->response->streambuf.size() - bytes_transferred;
auto post_process = [this, session, tmp_streambuf, length]() { if((2 + length) > num_additional_bytes) {
std::ostream tmp_stream(tmp_streambuf.get()); session->connection->set_timeout();
asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(2 + length - num_additional_bytes), [this, session, chunks_streambuf, length](const error_code &ec, size_t /*bytes_transferred*/) {
session->connection->cancel_timeout();
auto lock = session->connection->handler_runner->continue_lock();
if(!lock)
return;
if(!ec) {
if(session->response->streambuf.size() == session->response->streambuf.max_size()) {
session->callback(session->connection, make_error_code::make_error_code(errc::message_size));
return;
}
this->read_chunked_transfer_encoded_chunk(session, chunks_streambuf, length);
}
else
session->callback(session->connection, ec);
});
}
else
this->read_chunked_transfer_encoded_chunk(session, chunks_streambuf, length);
}
else
session->callback(session->connection, ec);
});
}
void read_chunked_transfer_encoded_chunk(const std::shared_ptr<Session> &session, const std::shared_ptr<asio::streambuf> &chunks_streambuf, unsigned long length) {
std::ostream tmp_stream(chunks_streambuf.get());
if(length > 0) { if(length > 0) {
std::unique_ptr<char[]> buffer(new char[length]); std::unique_ptr<char[]> buffer(new char[length]);
session->response->content.read(buffer.get(), static_cast<std::streamsize>(length)); session->response->content.read(buffer.get(), static_cast<std::streamsize>(length));
tmp_stream.write(buffer.get(), static_cast<std::streamsize>(length)); tmp_stream.write(buffer.get(), static_cast<std::streamsize>(length));
if(tmp_streambuf->size() == tmp_streambuf->max_size()) { if(chunks_streambuf->size() == chunks_streambuf->max_size()) {
session->callback(session->connection, make_error_code::make_error_code(errc::message_size)); session->callback(session->connection, make_error_code::make_error_code(errc::message_size));
return; return;
} }
@ -584,41 +610,15 @@ namespace SimpleWeb {
session->response->content.get(); session->response->content.get();
if(length > 0) if(length > 0)
this->read_chunked(session, tmp_streambuf); read_chunked_transfer_encoded(session, chunks_streambuf);
else { else {
if(tmp_streambuf->size() > 0) { if(chunks_streambuf->size() > 0) {
std::ostream response_stream(&session->response->streambuf); std::ostream response_stream(&session->response->streambuf);
response_stream << tmp_streambuf.get(); response_stream << chunks_streambuf.get();
} }
error_code ec; error_code ec;
session->callback(session->connection, ec); session->callback(session->connection, ec);
} }
};
if((2 + length) > num_additional_bytes) {
session->connection->set_timeout();
asio::async_read(*session->connection->socket, session->response->streambuf, asio::transfer_exactly(2 + length - num_additional_bytes), [this, session, post_process](const error_code &ec, size_t /*bytes_transferred*/) {
session->connection->cancel_timeout();
auto lock = session->connection->handler_runner->continue_lock();
if(!lock)
return;
if(!ec) {
if(session->response->streambuf.size() == session->response->streambuf.max_size()) {
session->callback(session->connection, make_error_code::make_error_code(errc::message_size));
return;
}
post_process();
}
else
session->callback(session->connection, ec);
});
}
else
post_process();
}
else
session->callback(session->connection, ec);
});
} }
}; };