Moving FIXME comments, adding debugging output in tests, and an additional case for HTTP/0.9 versions.

Dean Michael Berris · Dean Michael Berris · commit f5a7209d4c5c · 2010-09-14T14:59:33.000+08:00
diff --git a/boost/network/protocol/http/parser/incremental.hpp b/boost/network/protocol/http/parser/incremental.hpp
@@ -66,6 +66,7 @@ namespace boost { namespace network { namespace http {
 
         template <class Range>
         fusion::tuple<logic::tribool,range_type> parse_until(state_t stop_state, Range & range_) {
+            //FIXME -- find a way to make better use of the Boost.String_algorithm classifiers
             logic::tribool parsed_ok(logic::indeterminate);
             iterator_type start = boost::begin(range_),
                 current = start,
@@ -123,7 +124,6 @@ namespace boost { namespace network { namespace http {
                         }
                         break;
                     case http_version_slash:
-                        // FIXME find a better way to use is_digit
                         if (algorithm::is_digit()(*current)) {
                             state_ = http_version_major;
                             ++current;
@@ -140,7 +140,6 @@ namespace boost { namespace network { namespace http {
                         }
                         break;
                     case http_version_dot:
-                        // FIXME find a better way to use is_digit
                         if (algorithm::is_digit()(*current)) {
                             state_ = http_version_minor;
                             ++current;
@@ -157,7 +156,6 @@ namespace boost { namespace network { namespace http {
                         }
                         break;
                     case http_version_done:
-                        // FIXME find a better way to use is_digit
                         if (algorithm::is_digit()(*current)) {
                             state_ = http_status_digit;
                             ++current;
@@ -166,7 +164,6 @@ namespace boost { namespace network { namespace http {
                         }
                         break;
                     case http_status_digit:
-                        // FIXME find a better way to use is_digit
                         if (algorithm::is_digit()(*current)) {
                             ++current;
                         } else if (*current == ' ') {
@@ -177,7 +174,6 @@ namespace boost { namespace network { namespace http {
                         }
                         break;
                     case http_status_done:
-                        // FIXME find a better way to use is_alnum, is_space
                         if (algorithm::is_alnum()(*current)) {
                             state_ = http_status_message_char;
                             ++current;
@@ -186,7 +182,6 @@ namespace boost { namespace network { namespace http {
                         }
                         break;
                     case http_status_message_char:
-                        // FIXME find a better way to use is_alnum, is_space
                         if (algorithm::is_alnum()(*current) || algorithm::is_punct()(*current) || (*current == ' ')) {
                             ++current;
                         } else if (*current == '\r') {
diff --git a/libs/network/test/http_incremental_parser.cpp b/libs/network/test/http_incremental_parser.cpp
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_http_version) {
         valid_http_version);
     BOOST_CHECK_EQUAL(parsed_ok, true);
     BOOST_CHECK(!boost::empty(result_range));
-    parsed = std::string(boost::begin(result_range), boost::end(result_range));
+    parsed.assign(boost::begin(result_range), boost::end(result_range));
     std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 
     p.reset();
@@ -95,7 +95,17 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_http_version) {
         response_parser_type::http_version_done,
         invalid_http_version);
     BOOST_CHECK_EQUAL(parsed_ok, false);
-    parsed = std::string(boost::begin(result_range), boost::end(result_range));
+    parsed.assign(boost::begin(result_range), boost::end(result_range));
+    std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
+
+    p.reset();
+    valid_http_version = "HTTP/0.9 ";
+    parsed_ok = logic::indeterminate;
+    fusion::tie(parsed_ok, result_range) = p.parse_until(
+        response_parser_type::http_version_done,
+        valid_http_version);
+    BOOST_CHECK_EQUAL(parsed_ok, true);
+    parsed.assign(boost::begin(result_range), boost::end(result_range));
     std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
 
@@ -182,6 +192,7 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_header_lines) {
         valid_headers);
     BOOST_CHECK_EQUAL(parsed_ok, true);
     std::string parsed1 = std::string(boost::begin(result_range), boost::end(result_range));
+    std::cout << "PARSED: " << parsed1 << " state=" << p.state() << std::endl;
     p.reset(response_parser_type::http_status_message_done);
     std::string::const_iterator end = valid_headers.end();
     valid_headers.assign(boost::end(result_range), end);
@@ -190,6 +201,7 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_header_lines) {
         valid_headers);
     BOOST_CHECK_EQUAL(parsed_ok, true);
     std::string parsed2 = std::string(boost::begin(result_range), boost::end(result_range));
+    std::cout << "PARSED: " << parsed2 << " state=" << p.state() << std::endl;
     valid_headers.assign(boost::end(result_range), end);
     p.reset(response_parser_type::http_status_message_done);
     fusion::tie(parsed_ok, result_range) = p.parse_until(
