From 9d422107abc0ae72930b5556579c57a2685e4d19 Mon Sep 17 00:00:00 2001
From: Peter Thorson <github@zaphoyd.com>
Date: Mon, 16 Jan 2012 11:14:51 -0600
Subject: [PATCH] adjusts whitespace

---
 src/connection.hpp   | 27 +++++++++++++++++++--------
 src/roles/server.hpp |  7 ++++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/connection.hpp b/src/connection.hpp
index ce50105583..29892b7553 100644
--- a/src/connection.hpp
+++ b/src/connection.hpp
@@ -239,7 +239,9 @@ public:
 protected:  
     void handle_socket_init(const boost::system::error_code& error) {
         if (error) {
-            m_endpoint.elog().at(log::elevel::ERROR) << "Connection initialization failed, error code: " << error << log::endl;
+            m_endpoint.elog().at(log::elevel::ERROR) 
+                << "Socket initialization failed, error code: " << error 
+                << log::endl;
             this->terminate(false);
             return;
         }
@@ -255,20 +257,24 @@ public:
             if (error == boost::asio::error::eof) {         
                 // got unexpected EOF
                 // TODO: log error
-                m_endpoint.elog().at(log::elevel::ERROR) << "Remote connection dropped unexpectedly" << log::endl;
+                m_endpoint.elog().at(log::elevel::ERROR) 
+                    << "Remote connection dropped unexpectedly" << log::endl;
                 terminate(false);
             } else if (error == boost::asio::error::operation_aborted) {
                 // got unexpected abort (likely our server issued an abort on
                 // all connections on this io_service)
                 
                 // TODO: log error
-                m_endpoint.elog().at(log::elevel::ERROR) << "Terminating due to abort: " << error << log::endl;
+                m_endpoint.elog().at(log::elevel::ERROR) 
+                    << "Terminating due to abort: " << error << log::endl;
                 terminate(true);
             } else {
                 // Other unexpected error
                 
                 // TODO: log error
-                m_endpoint.elog().at(log::elevel::ERROR) << "Terminating due to unknown error: " << error << log::endl;
+                m_endpoint.elog().at(log::elevel::ERROR) 
+                    << "Terminating due to unknown error: " << error 
+                    << log::endl;
                 terminate(false);
             }
         }
@@ -578,7 +584,8 @@ protected:
             // if we are in an inturrupted state and had nothing else to write
             // it is safe to terminate the connection.
             if (m_write_state == INTURRUPT) {
-                m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "Exit after inturrupt" << log::endl;
+                m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) 
+                    << "Exit after inturrupt" << log::endl;
                 terminate(false);
             }
         }
@@ -588,7 +595,9 @@ protected:
         if (error) {
             if (error == boost::asio::error::operation_aborted) {
                 // previous write was aborted
-                m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "handle_write was called with operation_aborted error" << log::endl;
+                m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) 
+                    << "handle_write was called with operation_aborted error" 
+                    << log::endl;
             } else {
                 log_error("Error writing frame data",error);
                 terminate(false);
@@ -597,7 +606,8 @@ protected:
         }
         
         if (m_write_queue.size() == 0) {
-            m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "handle_write called with empty queue" << log::endl;
+            m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) 
+                << "handle_write called with empty queue" << log::endl;
             return;
         }
         
@@ -614,7 +624,8 @@ protected:
     // terminate cleans up a connection and removes it from the endpoint's 
     // connection list.
     void terminate(bool failed_by_me) {
-        m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) << "terminate called" << log::endl;
+        m_endpoint.alog().at(log::alevel::DEBUG_CLOSE) 
+            << "terminate called" << log::endl;
         
         if (m_state == session::state::CLOSED) {
             // shouldn't be here
diff --git a/src/roles/server.hpp b/src/roles/server.hpp
index a67151bc38..d20a70d5ce 100644
--- a/src/roles/server.hpp
+++ b/src/roles/server.hpp
@@ -339,7 +339,7 @@ void server<endpoint>::connection<connection_type>::async_init() {
         "\r\n\r\n",
         boost::bind(
             &type::handle_read_request,
-            m_connection.shared_from_this(), // shared from this?
+            m_connection.shared_from_this(),
             boost::asio::placeholders::error,
             boost::asio::placeholders::bytes_transferred
         )
@@ -353,7 +353,8 @@ void server<endpoint>::connection<connection_type>::handle_read_request(
 {
     if (error) {
         // log error
-        m_endpoint.elog().at(log::elevel::ERROR) << "Error reading HTTP request. code: " << error << log::endl;
+        m_endpoint.elog().at(log::elevel::ERROR) 
+            << "Error reading HTTP request. code: " << error << log::endl;
         m_connection.terminate(false);
         return;
     }
@@ -475,7 +476,7 @@ void server<endpoint>::connection<connection_type>::write_response() {
         // TODO: HTTP response
     }
     
-    m_response.replace_header("Server","WebSocket++/2011-11-18");
+    m_response.replace_header("Server","WebSocket++/0.2.0");
     
     std::string raw = m_response.raw();