Fixed HTTP headers parsing for async_server

omalashenko · omalashenko · commit 19efd8cf4478 · 2010-12-27T11:35:42.000+10:00
Ported commit 20fded1
diff --git a/boost/network/protocol/http/server/async_connection.hpp b/boost/network/protocol/http/server/async_connection.hpp
@@ -402,6 +402,7 @@ namespace boost { namespace network { namespace http {
                             request_.http_version_major = fusion::get<0>(version_pair);
                             request_.http_version_minor = fusion::get<1>(version_pair);
                             new_start = boost::end(result_range);
+                            partial_parsed.clear();
                         } else {
                             partial_parsed.append(
                                 boost::begin(result_range),
@@ -423,7 +424,6 @@ namespace boost { namespace network { namespace http {
                             partial_parsed.append(
                                 boost::begin(result_range),
                                 boost::end(result_range));
-                            trim(partial_parsed);
                             parse_headers(partial_parsed, request_.headers);
                             new_start = boost::end(result_range);
                             thread_pool().post(
diff --git a/libs/network/src/server_request_parsers_impl.cpp b/libs/network/src/server_request_parsers_impl.cpp
@@ -31,9 +31,10 @@ namespace boost { namespace network { namespace http {
             *(
                 +(alnum|(punct-':'))
                 >> lit(": ")
-                >> +(alnum|space|punct)
+                >> +((alnum|space|punct) - '\r' - '\n')
                 >> lit("\r\n")
             )
+            >> lit("\r\n")
             , container
             );
     }

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,10 @@ namespace boost { namespace network { namespace http {`
`31`	`31`	`*(`
`32`	`32`	`+(alnum\|(punct-':'))`
`33`	`33`	`>> lit(": ")`
`34`		`- >> +(alnum\|space\|punct)`
	`34`	`+ >> +((alnum\|space\|punct) - '\r' - '\n')`
`35`	`35`	`>> lit("\r\n")`
`36`	`36`	`)`
	`37`	`+ >> lit("\r\n")`
`37`	`38`	`, container`
`38`	`39`	`);`
`39`	`40`	`}`