Implementing header line parsing.

Dean Michael Berris · Dean Michael Berris · commit 09c705ba44fe · 2010-09-14T12:44:15.000+08:00
diff --git a/boost/network/protocol/http/parser/incremental.hpp b/boost/network/protocol/http/parser/incremental.hpp
@@ -34,7 +34,14 @@ namespace boost { namespace network { namespace http {
             http_status_done,
             http_status_message_char,
             http_status_message_cr,
-            http_status_message_done
+            http_status_message_done,
+            http_header_name_char,
+            http_header_colon,
+            http_header_value_char,
+            http_header_line_cr,
+            http_header_line_done,
+            http_headers_end_cr,
+            http_headers_done
         };
 
         typedef typename string<Tag>::type::const_iterator iterator_type;
@@ -197,6 +204,64 @@ namespace boost { namespace network { namespace http {
                             parsed_ok = false;
                         }
                         break;
+                    case http_status_message_done:
+                    case http_header_line_done:
+                        if (algorithm::is_alnum()(*current)) {
+                            state_ = http_header_name_char;
+                            ++current;
+                        } else if (*current == '\r') {
+                            state_ = http_headers_end_cr;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
+                    case http_header_name_char:
+                        if (*current == ':') {
+                            state_ = http_header_colon;
+                            ++current;
+                        } else if (algorithm::is_alnum()(*current) || algorithm::is_space()(*current) || algorithm::is_punct()(*current)) {
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
+                    case http_header_colon:
+                        if (algorithm::is_space()(*current)) {
+                            ++current;
+                        } else if (algorithm::is_alnum()(*current) || algorithm::is_punct()(*current)) {
+                            state_ = http_header_value_char;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
+                    case http_header_value_char:
+                        if (*current == '\r') {
+                            state_ = http_header_line_cr;
+                            ++current;
+                        } else if (algorithm::is_cntrl()(*current)) {
+                            parsed_ok = false;
+                        } else {
+                            ++current;
+                        }
+                        break;
+                    case http_header_line_cr:
+                        if (*current == '\n') {
+                            state_ = http_header_line_done;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
+                    case http_headers_end_cr:
+                        if (*current == '\n') {
+                            state_ = http_headers_done;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
                     default:
                         parsed_ok = false;
                     }
diff --git a/libs/network/test/http_incremental_parser.cpp b/libs/network/test/http_incremental_parser.cpp
@@ -169,3 +169,32 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_status_message) {
     std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
 
+BOOST_AUTO_TEST_CASE(incremental_parser_parse_header_lines) {
+    typedef response_parser<tags::default_string> response_parser_type;
+    typedef response_parser_type::range_type range_type;
+    response_parser_type p(response_parser_type::http_status_message_done);
+
+    std::string valid_headers = "Server: Foo\r\nContent-Type: application/json\r\n\r\n";
+    logic::tribool parsed_ok;
+    range_type result_range;
+    fusion::tie(parsed_ok, result_range) = p.parse_until(
+        response_parser_type::http_header_line_done,
+        valid_headers);
+    BOOST_CHECK_EQUAL(parsed_ok, true);
+    std::string parsed1 = std::string(boost::begin(result_range), boost::end(result_range));
+    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);
+    fusion::tie(parsed_ok, result_range) = p.parse_until(
+        response_parser_type::http_header_line_done,
+        valid_headers);
+    BOOST_CHECK_EQUAL(parsed_ok, true);
+    std::string parsed2 = std::string(boost::begin(result_range), boost::end(result_range));
+    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(
+        response_parser_type::http_headers_done,
+        valid_headers);
+    BOOST_CHECK_EQUAL(parsed_ok, true);
+    BOOST_CHECK(parsed1 != parsed2);
+}
