Adding test and implementation for status message parsing.

Dean Michael Berris · Dean Michael Berris · commit ad2b5db1b479 · 2010-09-14T11:52:07.000+08:00
diff --git a/boost/network/protocol/http/parser/incremental.hpp b/boost/network/protocol/http/parser/incremental.hpp
@@ -31,7 +31,10 @@ namespace boost { namespace network { namespace http {
             http_version_minor,
             http_version_done,
             http_status_digit,
-            http_status_done
+            http_status_done,
+            http_status_message_char,
+            http_status_message_cr,
+            http_status_message_done
         };
 
         typedef typename string<Tag>::type::const_iterator iterator_type;
@@ -166,6 +169,34 @@ namespace boost { namespace network { namespace http {
                             parsed_ok = false;
                         }
                         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;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        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') {
+                            state_ = http_status_message_cr;
+                            ++current;
+                        } else {
+                            parsed_ok = false;
+                        }
+                        break;
+                    case http_status_message_cr:
+                        if (*current == '\n') {
+                            state_ = http_status_message_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
@@ -132,3 +132,22 @@ BOOST_AUTO_TEST_CASE(incremental_parser_parse_status) {
     std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
 }
 
+/** In this test then we get the rest of the first line of the HTTP
+ *  Response, and treat it as the status message.
+ */
+BOOST_AUTO_TEST_CASE(incremental_parser_parse_status_message) {
+    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_done);
+    
+    std::string valid_status_message = "OK\r\nServer: Foo";
+    logic::tribool parsed_ok;
+    range_type result_range;
+    fusion::tie(parsed_ok, result_range) = p.parse_until(
+        response_parser_type::http_status_message_done,
+        valid_status_message);
+    BOOST_CHECK_EQUAL(parsed_ok, true);
+    std::string parsed = std::string(boost::begin(result_range), boost::end(result_range));
+    std::cout << "PARSED: " << parsed << " state=" << p.state() << std::endl;
+}
+
