ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollback.

Browse Source
This commit is contained in:
JoelKatz
2013-01-23 16:53:31 -08:00
parent 9ceae42220
commit 24cac01e47
1 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/cpp/websocketpp/src/roles/server.hpp
View File

@@ -53,32 +53,6 @@
namespace websocketpp { namespace websocketpp {
typedef boost::asio::buffers_iterator<boost::asio::streambuf::const_buffers_type> bufIterator;
static std::pair<bufIterator, bool> match_header(bufIterator begin, bufIterator end)
{
// Do we have a complete HTTP request
const std::string header_match = "\r\n\r\n";
bufIterator it = std::search(begin, end, header_match.begin(), header_match.end());
if (it != end)
return std::make_pair(it, true);
// If we don't have a flash policy request, we're done
const std::string flash_match = "<policy-file-request/>";
it = std::search(begin, end, flash_match.begin(), flash_match.end());
if (it == end)
return std::make_pair(end, false);
// If we have a line ending before the flash policy request, treat as http
const std::string eol_match = "\r\n";
bufIterator it2 = std::search(begin, end, eol_match.begin(), eol_match.end());
if ((it2 != end) || (it < it2))
return std::make_pair(end, false);
// Treat as flash policy request
return std::make_pair(it, true);
}
// Forward declarations // Forward declarations
template <typename T> struct endpoint_traits; template <typename T> struct endpoint_traits;
@@ -539,36 +513,18 @@ void server<endpoint>::connection<connection_type>::async_init() {
// TODO: make this value configurable // TODO: make this value configurable
m_connection.register_timeout(5000,fail::status::TIMEOUT_WS, m_connection.register_timeout(5000,fail::status::TIMEOUT_WS,
"Timeout on WebSocket handshake"); "Timeout on WebSocket handshake");
if (m_connection.isSecure()) boost::asio::async_read_until(
{ m_connection.get_socket(),
boost::asio::async_read_until( m_connection.buffer(),
m_connection.SSLSocket(), "\r\n\r\n",
m_connection.buffer(), m_connection.get_strand().wrap(boost::bind(
// match_header, &type::handle_read_request,
"\r\n\r\n", m_connection.shared_from_this(),
m_connection.get_strand().wrap(boost::bind( boost::asio::placeholders::error,
&type::handle_read_request, boost::asio::placeholders::bytes_transferred
m_connection.shared_from_this(), ))
boost::asio::placeholders::error, );
boost::asio::placeholders::bytes_transferred
))
);
}
else
{
boost::asio::async_read_until(
m_connection.PlainSocket(),
m_connection.buffer(),
match_header,
m_connection.get_strand().wrap(boost::bind(
&type::handle_read_request,
m_connection.shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred
))
);
}
} }
/// processes the response from an async read for an HTTP header /// processes the response from an async read for an HTTP header
@@ -840,7 +796,7 @@ void server<endpoint>::connection<connection_type>::write_response() {
m_endpoint.m_alog->at(log::alevel::DEBUG_HANDSHAKE) << raw << log::endl; m_endpoint.m_alog->at(log::alevel::DEBUG_HANDSHAKE) << raw << log::endl;
boost::asio::async_write( // FIXME boost::asio::async_write(
m_connection.get_socket(), m_connection.get_socket(),
//boost::asio::buffer(raw), //boost::asio::buffer(raw),
buffer, buffer,