Skip to content

Here's my attempt at properly handling the content length header #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 31, 2012
Merged

Here's my attempt at properly handling the content length header #164

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d00836d
Take content length into account when reading body
joelreymont Oct 30, 2012
78afee4
Qualify stoi and only catch exceptions thrown by it.
joelreymont Oct 31, 2012
a941fb1
Use optional member variable to keep track of content length.
joelreymont Oct 31, 2012
3079bda
Use size_t to store content length.
joelreymont Oct 31, 2012
4054936
Print a debug message if content length conversion to size_t fails.
joelreymont Oct 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 50 additions & 10 deletions include/network/protocol/http/client/connection/async_normal.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,20 +430,44 @@ struct http_async_connection_pimpl : boost::enable_shared_from_this<http_async_c
placeholders::bytes_transferred)));
} else {
NETWORK_MESSAGE("no callback provided, appending to body...");
bool get_more = true;
if (content_length_) {
buffer_type::const_iterator begin = this->part.begin();
buffer_type::const_iterator end = begin;
std::advance(end, bytes_transferred);
get_more = (end - begin) < *content_length_;
NETWORK_MESSAGE("content_length = " << * content_length_
<< ", bytes read = " << (end - begin) << ", read more = " << get_more);
}
// Here we don't have a body callback. Let's
// make sure that we deal with the remainder
// from the headers part in case we do have data
// that's still in the buffer.
this->parse_body(request_strand_.wrap(
boost::bind(
&this_type::handle_received_data,
this_type::shared_from_this(),
body,
get_body,
callback,
placeholders::error,
placeholders::bytes_transferred)),
bytes_transferred);
if (get_more) {
this->parse_body(request_strand_.wrap(
boost::bind(
&this_type::handle_received_data,
this_type::shared_from_this(),
body,
get_body,
callback,
placeholders::error,
placeholders::bytes_transferred)),
bytes_transferred);
} else {
std::string body_string;
std::swap(body_string, this->partial_parsed);
body_string.append(
this->part.begin()
, bytes_transferred
);
this->body_promise.set_value(body_string);
// TODO set the destination value somewhere!
this->destination_promise.set_value("");
this->source_promise.set_value("");
this->part.assign('\0');
this->response_parser_.reset();
}
}
}
return;
Expand Down Expand Up @@ -709,6 +733,21 @@ struct http_async_connection_pimpl : boost::enable_shared_from_this<http_async_c
boost::trim(header_pair.second);
headers.insert(header_pair);
}
// Set content length
content_length_ = boost::none;
auto it = headers.find("Content-Length");
if (it != headers.end()) {
try {
content_length_ = std::stoul(it->second);
NETWORK_MESSAGE("Content-Length: " << *content_length_);
} catch(const std::invalid_argument&) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest a NETWORK_MESSAGE here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What line number is here exactly? There's a NETWORK_MESSAGE printing the content length, for example.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inside the catch, print out that you got an invalid content length value.

NETWORK_MESSAGE("invalid argument exception while interpreting "
<< it->second << " as content length");
} catch(const std::out_of_range&) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are referring to a message on exception. Fair enough, will add.

NETWORK_MESSAGE("out of range exception while interpreting "
<< it->second << " as content length");
}
}
headers_promise.set_value(headers);
}

Expand Down Expand Up @@ -790,6 +829,7 @@ struct http_async_connection_pimpl : boost::enable_shared_from_this<http_async_c
boost::promise<boost::uint16_t> status_promise;
boost::promise<std::string> status_message_promise;
boost::promise<std::multimap<std::string, std::string> > headers_promise;
boost::optional<size_t> content_length_;
boost::promise<std::string> source_promise;
boost::promise<std::string> destination_promise;
boost::promise<std::string> body_promise;
Expand Down