Feb 28, 2013 · Feb 27, 2013 · Feb 27, 2013 · Feb 28, 2013 · Feb 28, 2013 · Feb 28, 2013
diff --git a/boost/network/protocol/http/client/connection/async_normal.hpp b/boost/network/protocol/http/client/connection/async_normal.hpp
                  this->part.begin()
                  , bytes_transferred
                  );
                this->body_promise.set_value(body_string);
                if (this->is_chunk_encoding)
                  this->body_promise.set_value(parse_chunk_encoding(body_string));
                else
                  this->body_promise.set_value(body_string);
              }
              // TODO set the destination value somewhere!
              this->destination_promise.set_value("");
        }
      }
    }

    string_type parse_chunk_encoding( string_type & body_string ) {
        string_type body;
        string_type crlf = "\r\n";

        typename string_type::iterator begin = body_string.begin();
        for (typename string_type::iterator iter =
                std::search(begin, body_string.end(), crlf.begin(), crlf.end());
                iter != body_string.end();
                iter = std::search(begin, body_string.end(), crlf.begin(), crlf.end())) {
            string_type line(begin, iter);
            if (line.empty())
                break;
            std::stringstream stream(line);
            int len;
            stream >> std::hex >> len;
            std::advance(iter, 2);
            if (!len)
                break;
            if (len <= body_string.end() - iter) {
                body.insert(body.end(), iter, iter + len);
                std::advance(iter, len);
            }
            begin = iter;
        }

        return body;
    }

    bool follow_redirect_;
    resolver_type & resolver_;
diff --git a/boost/network/protocol/http/client/connection/async_protocol_handler.hpp b/boost/network/protocol/http/client/connection/async_protocol_handler.hpp
        trim(header_pair.second);
        headers.insert(header_pair);
      }
      // determine if the body parser will need to handle chunked encoding
      typename headers_range<basic_response<Tag> >::type transfer_encoding_range =
          headers.equal_range("Transfer-Encoding");
      is_chunk_encoding = !empty(transfer_encoding_range)
          && boost::iequals(boost::begin(transfer_encoding_range)->second, "chunked");
      headers_promise.set_value(headers);
    }

    buffer_type part;
    typename buffer_type::const_iterator part_begin;
    string_type partial_parsed;
    bool is_chunk_encoding;
  };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -354,7 +354,10 @@ namespace boost { namespace network { namespace http { namespace impl {
		this->part.begin()
		, bytes_transferred
		);
		this->body_promise.set_value(body_string);
		if (this->is_chunk_encoding)
		this->body_promise.set_value(parse_chunk_encoding(body_string));
		else
		this->body_promise.set_value(body_string);
		}
		// TODO set the destination value somewhere!
		this->destination_promise.set_value("");
Expand DownExpand Up		@@ -428,6 +431,34 @@ namespace boost { namespace network { namespace http { namespace impl {
		}
		}
		}

		string_type parse_chunk_encoding( string_type & body_string ) {
		string_type body;
		string_type crlf = "\r\n";

		typename string_type::iterator begin = body_string.begin();
		for (typename string_type::iterator iter =
		std::search(begin, body_string.end(), crlf.begin(), crlf.end());
		iter != body_string.end();
		iter = std::search(begin, body_string.end(), crlf.begin(), crlf.end())) {
		string_type line(begin, iter);
		if (line.empty())
		break;
		std::stringstream stream(line);
		int len;
		stream >> std::hex >> len;
		std::advance(iter, 2);
		if (!len)
		break;
		if (len <= body_string.end() - iter) {
		body.insert(body.end(), iter, iter + len);
		std::advance(iter, len);
		}
		begin = iter;
		}

		return body;
		}

		bool follow_redirect_;
		resolver_type & resolver_;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -286,6 +286,11 @@ namespace boost { namespace network { namespace http { namespace impl {
		trim(header_pair.second);
		headers.insert(header_pair);
		}
		// determine if the body parser will need to handle chunked encoding
		typename headers_range<basic_response<Tag> >::type transfer_encoding_range =
		headers.equal_range("Transfer-Encoding");
		is_chunk_encoding = !empty(transfer_encoding_range)
		&& boost::iequals(boost::begin(transfer_encoding_range)->second, "chunked");
		headers_promise.set_value(headers);
		}

Expand DownExpand Up		@@ -373,6 +378,7 @@ namespace boost { namespace network { namespace http { namespace impl {
		buffer_type part;
		typename buffer_type::const_iterator part_begin;
		string_type partial_parsed;
		bool is_chunk_encoding;
Copy link Member deanberrisFeb 28, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This variable seems unnecessary. You only ever need to check this just before writing it into the message body once. Copy link Author skystrifeFeb 28, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Right, but without it I'm not sure how I'd get the header data to check if it's chunked encoding just before writing the message body. At that point, I have no reference to the response object, so I can't get the value stored in that future (and if I get a future from the promise that Ido have access to, I cause issues because there can only be one future for any given promise). I suppose I could try to look for that value as we're building up the buffer to parse the headers out with, but that felt more hacky than doing it this way, where I definitely have access to the headers that are about to be put into the promise. Maybe I'm overlooking a better way, though? Copy link Member deanberrisFeb 28, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ah, yes, you're right.
		};


Expand Down