Merge branch '0.9-devel' of https://github.com/omalashenko/cpp-netlib into omalashenko-0.9-devel

deanberris · deanberris · commit 060e1d420f7e · 2010-12-27T10:16:55.000+08:00
diff --git a/boost/network/protocol/http/server/async_connection.hpp b/boost/network/protocol/http/server/async_connection.hpp
@@ -291,7 +291,7 @@ namespace boost { namespace network { namespace http {
         Handler & handler;
         utils::thread_pool & thread_pool_;
         volatile bool headers_already_sent, first_line_already_sent, headers_in_progress, first_line_in_progress;
-        asio::streambuf headers_buffer;
+        asio::streambuf headers_buffer, first_line_buffer;
 
         boost::recursive_mutex headers_mutex;
         buffer_type read_buffer_;
@@ -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(
@@ -503,19 +503,18 @@ namespace boost { namespace network { namespace http {
             if (first_line_in_progress) return;
             first_line_in_progress = true;
 
-            std::vector<asio::const_buffer> buffers;
             typedef constants<Tag> consts;
-            typename ostringstream<Tag>::type first_line_stream;
-            first_line_stream 
+            first_line_buffer.consume(first_line_buffer.size());
+            std::ostream first_line_stream(&first_line_buffer);
+            first_line_stream
                 << consts::http_slash() << 1<< consts::dot() << 1 << consts::space()
                 << status << consts::space() << status_message(status)
                 << consts::crlf()
+                << std::flush
                 ;
-            std::string first_line = first_line_stream.str();
-            buffers.push_back(asio::buffer(first_line));
             asio::async_write(
                 socket()
-                , buffers
+                , first_line_buffer
                 , callback);
         }
 
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`	`}`