diff --git a/CMakeLists.txt b/CMakeLists.txt
index edbdd5a920..78a8beef1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,7 +203,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
     else ()
         message (FATAL_ERROR "Failed to find required dependency: boost")
     endif ()
-    
+
     find_package(OpenSSL)
 endif()
 
diff --git a/COPYING b/COPYING
index 2c37a47789..0ea3913edb 100644
--- a/COPYING
+++ b/COPYING
@@ -11,13 +11,13 @@ modification, are permitted provided that the following conditions are met:
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/SConstruct b/SConstruct
index 3a82ab9b7f..e7f69bc3ea 100644
--- a/SConstruct
+++ b/SConstruct
@@ -157,7 +157,7 @@ else:
    print "C++11 build environment disabled"
 
 # if the build system is known to allow the isystem modifier for library include
-# values then use it for the boost libraries. Otherwise just add them to the 
+# values then use it for the boost libraries. Otherwise just add them to the
 # regular CPPPATH values.
 if env['CXX'].startswith('g++') or env['CXX'].startswith('clang'):
 	env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
@@ -166,7 +166,7 @@ else:
 env.Append(LIBPATH = [env['BOOST_LIBS']])
 
 # if the build system is known to allow the isystem modifier for library include
-# values then use it for the boost libraries. Otherwise just add them to the 
+# values then use it for the boost libraries. Otherwise just add them to the
 # regular CPPPATH values.
 if env_cpp11['CXX'].startswith('g++') or env_cpp11['CXX'].startswith('clang'):
 	env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
diff --git a/changelog.md b/changelog.md
index 0c45786a2f..3e8e36a9be 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,7 +11,7 @@ HEAD
   binary sizes.
 - Updates handling of Server and User-Agent headers to better handle custom
   settings and allow suppression of these headers for security purposes.
-- Fix issue where pong timeout handler always fired. Thank you Steven Klassen 
+- Fix issue where pong timeout handler always fired. Thank you Steven Klassen
   for reporting this bug.
 - Add ping and pong endpoint wrapper methods
 - Add `get_request()` pass through method to connection to allow calling methods
@@ -25,7 +25,7 @@ HEAD
 0.3.0-alpha2 - 2013-06-09
 - Fix a regression that caused servers being sent two close frames in a row
   to end a connection uncleanly. #259
-- Fix a regression that caused spurious frames following a legitimate close 
+- Fix a regression that caused spurious frames following a legitimate close
   frames to erroneously trigger handlers. #258
 - Change default HTTP response error code when no http_handler is defined from
   500/Internal Server Error to 426/Upgrade Required
diff --git a/examples/associative_storage/associative_storage.cpp b/examples/associative_storage/associative_storage.cpp
index a5dd3e32fb..e2245e4e43 100644
--- a/examples/associative_storage/associative_storage.cpp
+++ b/examples/associative_storage/associative_storage.cpp
@@ -20,55 +20,55 @@ class print_server {
 public:
     print_server() : m_next_sessionid(1) {
         m_server.init_asio();
-                
+
         m_server.set_open_handler(bind(&print_server::on_open,this,::_1));
         m_server.set_close_handler(bind(&print_server::on_close,this,::_1));
         m_server.set_message_handler(bind(&print_server::on_message,this,::_1,::_2));
     }
-    
+
     void on_open(connection_hdl hdl) {
         connection_data data;
-        
+
         data.sessionid = m_next_sessionid++;
         data.name = "";
-        
+
         m_connections[hdl] = data;
     }
-    
+
     void on_close(connection_hdl hdl) {
         connection_data& data = get_data_from_hdl(hdl);
-        
-        std::cout << "Closing connection " << data.name 
+
+        std::cout << "Closing connection " << data.name
                   << " with sessionid " << data.sessionid << std::endl;
-        
+
         m_connections.erase(hdl);
     }
-    
+
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         connection_data& data = get_data_from_hdl(hdl);
-        
+
         if (data.name == "") {
             data.name = msg->get_payload();
-            std::cout << "Setting name of connection with sessionid " 
+            std::cout << "Setting name of connection with sessionid "
                       << data.sessionid << " to " << data.name << std::endl;
         } else {
-            std::cout << "Got a message from connection " << data.name 
+            std::cout << "Got a message from connection " << data.name
                       << " with sessionid " << data.sessionid << std::endl;
         }
     }
-    
+
     connection_data& get_data_from_hdl(connection_hdl hdl) {
         auto it = m_connections.find(hdl);
-        
+
         if (it == m_connections.end()) {
             // this connection is not in the list. This really shouldn't happen
             // and probably means something else is wrong.
             throw std::invalid_argument("No data available for session");
         }
-        
+
         return it->second;
     }
-    
+
     void run(uint16_t port) {
         m_server.listen(port);
         m_server.start_accept();
@@ -85,4 +85,4 @@ private:
 int main() {
     print_server server;
     server.run(9002);
-}
\ No newline at end of file
+}
diff --git a/examples/broadcast_server/broadcast_server.cpp b/examples/broadcast_server/broadcast_server.cpp
index 70e48b9554..4066e07e58 100644
--- a/examples/broadcast_server/broadcast_server.cpp
+++ b/examples/broadcast_server/broadcast_server.cpp
@@ -35,31 +35,31 @@ enum action_type {
 struct action {
     action(action_type t, connection_hdl h) : type(t), hdl(h) {}
     action(action_type t, server::message_ptr m) : type(t), msg(m) {}
-    
+
     action_type type;
     websocketpp::connection_hdl hdl;
     server::message_ptr msg;
 };
- 
+
 class broadcast_server {
 public:
     broadcast_server() {
         // Initialize Asio Transport
         m_server.init_asio();
-        
+
         // Register handler callbacks
         m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
         m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
         m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
     }
-    
+
     void run(uint16_t port) {
         // listen on specified port
         m_server.listen(port);
-        
+
         // Start the server accept loop
 	    m_server.start_accept();
-	    
+
 	    // Start the ASIO io_service run loop
         try {
             m_server.run();
@@ -71,7 +71,7 @@ public:
             std::cout << "other exception" << std::endl;
         }
     }
-    
+
     void on_open(connection_hdl hdl) {
         unique_lock<mutex> lock(m_action_lock);
         //std::cout << "on_open" << std::endl;
@@ -79,7 +79,7 @@ public:
         lock.unlock();
         m_action_cond.notify_one();
     }
-    
+
     void on_close(connection_hdl hdl) {
         unique_lock<mutex> lock(m_action_lock);
         //std::cout << "on_close" << std::endl;
@@ -87,7 +87,7 @@ public:
         lock.unlock();
         m_action_cond.notify_one();
     }
-    
+
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         // queue message up for sending by processing thread
         unique_lock<mutex> lock(m_action_lock);
@@ -96,20 +96,20 @@ public:
         lock.unlock();
         m_action_cond.notify_one();
     }
-    
+
     void process_messages() {
         while(1) {
             unique_lock<mutex> lock(m_action_lock);
-            
+
             while(m_actions.empty()) {
                 m_action_cond.wait(lock);
             }
-            
+
             action a = m_actions.front();
             m_actions.pop();
-            
+
             lock.unlock();
-            
+
             if (a.type == SUBSCRIBE) {
                 unique_lock<mutex> lock(m_connection_lock);
                 m_connections.insert(a.hdl);
@@ -118,7 +118,7 @@ public:
                 m_connections.erase(a.hdl);
             } else if (a.type == MESSAGE) {
                 unique_lock<mutex> lock(m_connection_lock);
-                
+
                 con_list::iterator it;
                 for (it = m_connections.begin(); it != m_connections.end(); ++it) {
                     m_server.send(*it,a.msg);
@@ -130,11 +130,11 @@ public:
     }
 private:
     typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
-    
+
     server m_server;
     con_list m_connections;
     std::queue<action> m_actions;
-    
+
     mutex m_action_lock;
     mutex m_connection_lock;
     condition_variable m_action_cond;
@@ -143,15 +143,15 @@ private:
 int main() {
 	try {
 	broadcast_server server;
-	
+
 	// Start a thread to run the processing loop
 	thread t(bind(&broadcast_server::process_messages,&server));
-	
+
 	// Run the asio loop with the main thread
 	server.run(9002);
-	
+
 	t.join();
-	
+
 	} catch (std::exception & e) {
 	    std::cout << e.what() << std::endl;
 	}
diff --git a/examples/dev/main.cpp b/examples/dev/main.cpp
index 241f0f780b..9e93f68427 100644
--- a/examples/dev/main.cpp
+++ b/examples/dev/main.cpp
@@ -32,169 +32,169 @@ typedef websocketpp::server<websocketpp::config::core> server;
 		}
 		return true;
 	}
-	
+
 	void http(connection_ptr con) {
 	    std::cout << "handler http" << std::endl;
 	}
-	
+
 	void on_load(connection_ptr con, ptr old_handler) {
 		std::cout << "handler on_load" << std::endl;
 	}
 	void on_unload(connection_ptr con, ptr new_handler) {
 		std::cout << "handler on_unload" << std::endl;
 	}
-	
+
 	void on_open(connection_ptr con) {
 		std::cout << "handler on_open" << std::endl;
 	}
 	void on_fail(connection_ptr con) {
 		std::cout << "handler on_fail" << std::endl;
 	}
-	
+
 	void on_message(connection_ptr con, message_ptr msg) {
 		std::cout << "handler on_message" << std::endl;
-		
-		
+
+
 	}
-	
+
 	void on_close(connection_ptr con) {
 		std::cout << "handler on_close" << std::endl;
 	}
 };*/
 
 int main() {
-	typedef websocketpp::message_buffer::message<websocketpp::message_buffer::alloc::con_msg_manager> 
+	typedef websocketpp::message_buffer::message<websocketpp::message_buffer::alloc::con_msg_manager>
 		message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_man_type;
 
 	con_msg_man_type::ptr manager(new con_msg_man_type());
-	
+
 	size_t foo = 1024;
-	
+
 	message_type::ptr input = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
 	message_type::ptr output = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
 	websocketpp::frame::masking_key_type key;
-	
+
 	std::random_device dev;
-	
-	
-	
+
+
+
 	key.i = 0x12345678;
-	
+
 	double m = 18094238402394.0824923;
-	
+
 	/*std::cout << "Some Math" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		for (int i = 0; i < foo; i++) {
 			m /= 1.001;
 		}
-		
+
 	}*/
-	
+
 	std::cout << m << std::endl;
-	
+
 	std::cout << "Random Gen" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		input->get_raw_payload().replace(0,foo,foo,'\0');
 		output->get_raw_payload().replace(0,foo,foo,'\0');
 	}
-	
+
 	std::cout << "Out of place accelerated" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(output->get_raw_payload().data())), foo, key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'\0');
 	output->get_raw_payload().replace(0,foo,foo,'\0');
-	
+
 	std::cout << "In place accelerated" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), foo, key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'\0');
 	output->get_raw_payload().replace(0,foo,foo,'\0');
 	std::cout << "Out of place byte by byte" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin(), key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'\0');
 	output->get_raw_payload().replace(0,foo,foo,'\0');
 	std::cout << "In place byte by byte" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), input->get_raw_payload().begin(), key);
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	input->get_raw_payload().replace(0,foo,foo,'a');
 	output->get_raw_payload().replace(0,foo,foo,'b');
 	std::cout << "Copy" << std::endl;
 	{
 		boost::timer::auto_cpu_timer t;
-		
+
 		std::copy(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin());
 	}
-	
+
 	std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
 	std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
-	
+
 	/*server::handler::ptr h(new handler());
-	
+
 	server test_server(h);
 	server::connection_ptr con;
-	
+
 	std::stringstream output;
-	
+
 	test_server.register_ostream(&output);
-	
+
 	con = test_server.get_connection();
-	
+
 	con->start();
-	
+
 	//foo.handle_accept(con,true);
-	
+
 	std::stringstream input;
 	input << "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
 	//input << "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
 	input >> *con;
-	
+
 	std::stringstream input2;
 	input2 << "messageabc2";
 	input2 >> *con;
-	
+
 	std::stringstream input3;
 	input3 << "messageabc3";
 	input3 >> *con;
-	
+
 	std::stringstream input4;
 	input4 << "close";
 	input4 >> *con;
-	
+
 	std::cout << "connection output:" << std::endl;
 	std::cout << output.str() << std::endl;*/
 }
diff --git a/examples/echo_server/CMakeLists.txt b/examples/echo_server/CMakeLists.txt
index adacc6aa76..a82dfa792a 100644
--- a/examples/echo_server/CMakeLists.txt
+++ b/examples/echo_server/CMakeLists.txt
@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
diff --git a/examples/echo_server/echo_handler.hpp b/examples/echo_server/echo_handler.hpp
index 96f15fe531..f906342122 100644
--- a/examples/echo_server/echo_handler.hpp
+++ b/examples/echo_server/echo_handler.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp
index db86234214..f1f60e2d2c 100644
--- a/examples/echo_server/echo_server.cpp
+++ b/examples/echo_server/echo_server.cpp
@@ -15,14 +15,14 @@ typedef server::message_ptr message_ptr;
 
 // Define a callback to handle incoming messages
 void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get() 
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
               << " and message: " << msg->get_payload()
               << std::endl;
 
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
-        std::cout << "Echo failed because: " << e  
+        std::cout << "Echo failed because: " << e
                   << "(" << e.message() << ")" << std::endl;
     }
 }
@@ -30,24 +30,24 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
 int main() {
 	// Create a server endpoint
     server echo_server;
-	
+
 	try {
         // Set logging settings
         echo_server.set_access_channels(websocketpp::log::alevel::all);
         echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
-        
+
         // Initialize ASIO
         echo_server.init_asio();
-        
+
         // Register our message handler
         echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
-        
+
         // Listen on port 9002
         echo_server.listen(9002);
-        
+
         // Start the server accept loop
         echo_server.start_accept();
-	    
+
 	    // Start the ASIO io_service run loop
         echo_server.run();
     } catch (const std::exception & e) {
diff --git a/examples/echo_server_tls/CMakeLists.txt b/examples/echo_server_tls/CMakeLists.txt
index 619ac41ff9..b87cbb1f00 100644
--- a/examples/echo_server_tls/CMakeLists.txt
+++ b/examples/echo_server_tls/CMakeLists.txt
@@ -1,10 +1,10 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
 
 if (OPENSSL_FOUND)
-    
+
 init_target (echo_server_tls)
 
 build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
@@ -12,4 +12,4 @@ build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 link_boost ()
 link_openssl()
 final_target ()
-endif()
\ No newline at end of file
+endif()
diff --git a/examples/echo_server_tls/echo_handler_tls.hpp b/examples/echo_server_tls/echo_handler_tls.hpp
index 96f15fe531..f906342122 100644
--- a/examples/echo_server_tls/echo_handler_tls.hpp
+++ b/examples/echo_server_tls/echo_handler_tls.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
diff --git a/examples/echo_server_tls/echo_server_tls.cpp b/examples/echo_server_tls/echo_server_tls.cpp
index 43ac0fc289..feeb05b874 100644
--- a/examples/echo_server_tls/echo_server_tls.cpp
+++ b/examples/echo_server_tls/echo_server_tls.cpp
@@ -15,14 +15,14 @@ typedef websocketpp::config::asio::message_type::ptr message_ptr;
 typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 
 void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get() 
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
               << " and message: " << msg->get_payload()
               << std::endl;
 
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
-        std::cout << "Echo failed because: " << e  
+        std::cout << "Echo failed because: " << e
                   << "(" << e.message() << ")" << std::endl;
     }
 }
@@ -51,7 +51,7 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
 int main() {
     // Create a server endpoint
 	server echo_server;
-	
+
     // Initialize ASIO
 	echo_server.init_asio();
 
@@ -59,10 +59,10 @@ int main() {
     echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
     echo_server.set_tls_init_handler(bind(&on_tls_init,::_1));
 
-	
+
 	// Listen on port 9002
 	echo_server.listen(9002);
-	
+
 	// Start the server accept loop
 	echo_server.start_accept();
 
diff --git a/examples/handler_switch/handler_switch.cpp b/examples/handler_switch/handler_switch.cpp
index e877b3fe99..c2cf6ffa4c 100644
--- a/examples/handler_switch/handler_switch.cpp
+++ b/examples/handler_switch/handler_switch.cpp
@@ -17,12 +17,12 @@ void custom_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
 
 void default_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
     std::cout << "Message sent to default handler" << std::endl;
-    
+
     if (msg->get_payload() == "upgrade") {
         // Upgrade our connection_hdl to a full connection_ptr
         server::connection_ptr con = s.get_con_from_hdl(hdl);
-        
-        // Change the on message handler for this connection only to 
+
+        // Change the on message handler for this connection only to
         // custom_on_mesage
         con->set_message_handler(bind(&custom_on_msg,ref(s),::_1,::_2));
         std::cout << "Upgrading connection to custom handler" << std::endl;
@@ -39,4 +39,4 @@ int main() {
     s.start_accept();
 
     s.run();
-}
\ No newline at end of file
+}
diff --git a/examples/iostream_server/iostream_server.cpp b/examples/iostream_server/iostream_server.cpp
index b1c3f0769f..617631369c 100644
--- a/examples/iostream_server/iostream_server.cpp
+++ b/examples/iostream_server/iostream_server.cpp
@@ -17,17 +17,17 @@ typedef server::message_ptr message_ptr;
 // Define a callback to handle incoming messages
 void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
     if (msg->get_opcode() == websocketpp::frame::opcode::text) {
-        s->get_alog().write(websocketpp::log::alevel::app, 
+        s->get_alog().write(websocketpp::log::alevel::app,
                 	"Text Message Received: "+msg->get_payload());
     } else {
-        s->get_alog().write(websocketpp::log::alevel::app, 
+        s->get_alog().write(websocketpp::log::alevel::app,
                 	"Binary Message Received: "+websocketpp::utility::to_hex(msg->get_payload()));
-    }  
-    
+    }
+
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
-        s->get_alog().write(websocketpp::log::alevel::app, 
+        s->get_alog().write(websocketpp::log::alevel::app,
                 	"Echo Failed: "+e.message());
     }
 }
@@ -35,43 +35,43 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
 int main() {
     server s;
     std::ofstream log;
-	
-	try {        
+
+	try {
         // set up access channels to only log interesting things
         s.clear_access_channels(websocketpp::log::alevel::all);
         s.set_access_channels(websocketpp::log::alevel::connect);
         s.set_access_channels(websocketpp::log::alevel::disconnect);
         s.set_access_channels(websocketpp::log::alevel::app);
-        
-        // Log to a file rather than stdout, as we are using stdout for real 
+
+        // Log to a file rather than stdout, as we are using stdout for real
         // output
         log.open("output.log");
         s.get_alog().set_ostream(&log);
         s.get_elog().set_ostream(&log);
-        
+
         // print all output to stdout
         s.register_ostream(&std::cout);
-        
+
         // Register our message handler
         s.set_message_handler(bind(&on_message,&s,::_1,::_2));
-        
+
         server::connection_ptr con = s.get_connection();
-        
+
         con->start();
-        
-        // C++ iostream's don't support the idea of asynchronous i/o. As such 
-        // there are two input strategies demonstrated here. Buffered I/O will 
-        // read from stdin in chunks until EOF. This works very well for 
+
+        // C++ iostream's don't support the idea of asynchronous i/o. As such
+        // there are two input strategies demonstrated here. Buffered I/O will
+        // read from stdin in chunks until EOF. This works very well for
         // replaying canned connections as would be done in automated testing.
         //
-        // If the server is being used live however, assuming input is being 
-        // piped from elsewhere in realtime, this strategy will result in small 
-        // messages being buffered forever. The non-buffered strategy below  
-        // reads characters from stdin one at a time. This is inefficient and 
-        // for more serious uses should be replaced with a platform specific 
+        // If the server is being used live however, assuming input is being
+        // piped from elsewhere in realtime, this strategy will result in small
+        // messages being buffered forever. The non-buffered strategy below
+        // reads characters from stdin one at a time. This is inefficient and
+        // for more serious uses should be replaced with a platform specific
         // asyncronous i/o technique like select, poll, IOCP, etc
         bool buffered_io = false;
-        
+
         if (buffered_io) {
             std::cin >> *con;
         } else {
@@ -88,4 +88,4 @@ int main() {
         std::cout << "other exception" << std::endl;
     }
     log.close();
-}
\ No newline at end of file
+}
diff --git a/examples/print_server/CMakeLists.txt b/examples/print_server/CMakeLists.txt
index 2204c30517..dc34879b64 100644
--- a/examples/print_server/CMakeLists.txt
+++ b/examples/print_server/CMakeLists.txt
@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
diff --git a/examples/simple_broadcast_server/simple_broadcast_server.cpp b/examples/simple_broadcast_server/simple_broadcast_server.cpp
index e1686bcf7a..7c4847693a 100644
--- a/examples/simple_broadcast_server/simple_broadcast_server.cpp
+++ b/examples/simple_broadcast_server/simple_broadcast_server.cpp
@@ -13,20 +13,20 @@ class broadcast_server {
 public:
     broadcast_server() {
         m_server.init_asio();
-                
+
         m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
         m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
         m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
     }
-    
+
     void on_open(connection_hdl hdl) {
         m_connections.insert(hdl);
     }
-    
+
     void on_close(connection_hdl hdl) {
         m_connections.erase(hdl);
     }
-    
+
     void on_message(connection_hdl hdl, server::message_ptr msg) {
         for (auto it : m_connections) {
             m_server.send(it,msg);
@@ -48,4 +48,4 @@ private:
 int main() {
     broadcast_server server;
     server.run(9002);
-}
\ No newline at end of file
+}
diff --git a/examples/sip_client/CMakeLists.txt b/examples/sip_client/CMakeLists.txt
index 3ac386d562..65a90b01cb 100644
--- a/examples/sip_client/CMakeLists.txt
+++ b/examples/sip_client/CMakeLists.txt
@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
diff --git a/examples/sip_client/sip_client.cpp b/examples/sip_client/sip_client.cpp
index 3a4de786f3..990d76fc3c 100644
--- a/examples/sip_client/sip_client.cpp
+++ b/examples/sip_client/sip_client.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include <boost/thread/thread.hpp> 
+#include <boost/thread/thread.hpp>
 
 typedef websocketpp::client<websocketpp::config::asio_client> client;
 
@@ -21,12 +21,12 @@ typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
 client sip_client;
 
 
-bool received; 
+bool received;
 
 void on_open(client* c, websocketpp::connection_hdl hdl) {
     // now it is safe to use the connection
     std::cout << "connection ready" << std::endl;
-    
+
     received=false;
     // Send a SIP OPTIONS message to the server:
     std::string SIP_msg="OPTIONS sip:carol@chicago.com SIP/2.0\r\nVia: SIP/2.0/WS df7jal23ls0d.invalid;rport;branch=z9hG4bKhjhs8ass877\r\nMax-Forwards: 70\r\nTo: <sip:carol@chicago.com>\r\nFrom: Alice <sip:alice@atlanta.com>;tag=1928301774\r\nCall-ID: a84b4c76e66710\r\nCSeq: 63104 OPTIONS\r\nContact: <sip:alice@pc33.atlanta.com>\r\nAccept: application/sdp\r\nContent-Length: 0\r\n\r\n";
@@ -35,32 +35,32 @@ void on_open(client* c, websocketpp::connection_hdl hdl) {
 
 void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
     client::connection_ptr con = sip_client.get_con_from_hdl(hdl);
-    
+
     std::cout << "Received a reply:" << std::endl;
     fwrite(msg->get_payload().c_str(), msg->get_payload().size(), 1, stdout);
     received=true;
 }
 
 int main(int argc, char* argv[]) {
-	
+
 	std::string uri = "ws://localhost:9001";
-	
+
 	if (argc == 2) {
 	    uri = argv[1];
 	}
-	
+
 	try {
         // We expect there to be a lot of errors, so suppress them
         sip_client.clear_access_channels(websocketpp::log::alevel::all);
         sip_client.clear_error_channels(websocketpp::log::elevel::all);
-        
+
         // Initialize ASIO
         sip_client.init_asio();
-        
+
         // Register our handlers
         sip_client.set_open_handler(bind(&on_open,&sip_client,::_1));
         sip_client.set_message_handler(bind(&on_message,&sip_client,::_1,::_2));
-        
+
         websocketpp::lib::error_code ec;
         client::connection_ptr con = sip_client.get_connection(uri, ec);
 
@@ -68,16 +68,16 @@ int main(int argc, char* argv[]) {
         con->add_subprotocol("sip");
 
         sip_client.connect(con);
-	    
+
 	    // Start the ASIO io_service run loop
         sip_client.run();
-        
+
         while(!received) {
             boost::this_thread::sleep(boost::posix_time::milliseconds(100));
         }
-        
+
         std::cout << "done" << std::endl;
-        
+
     } catch (const std::exception & e) {
         std::cout << e.what() << std::endl;
     } catch (websocketpp::lib::error_code e) {
diff --git a/examples/subprotocol_server/subprotocol_server.cpp b/examples/subprotocol_server/subprotocol_server.cpp
index 0cdc1d0cd0..ecf8fecbe3 100644
--- a/examples/subprotocol_server/subprotocol_server.cpp
+++ b/examples/subprotocol_server/subprotocol_server.cpp
@@ -14,20 +14,20 @@ using websocketpp::lib::ref;
 
 bool validate(server & s, connection_hdl hdl) {
     server::connection_ptr con = s.get_con_from_hdl(hdl);
-    
+
     std::cout << "Cache-Control: " << con->get_request_header("Cache-Control") << std::endl;
-    
+
     const std::vector<std::string> & subp_requests = con->get_requested_subprotocols();
     std::vector<std::string>::const_iterator it;
-    
+
     for (it = subp_requests.begin(); it != subp_requests.end(); ++it) {
         std::cout << "Requested: " << *it << std::endl;
     }
-    
+
     if (subp_requests.size() > 0) {
         con->select_subprotocol(subp_requests[0]);
     }
-    
+
     return true;
 }
 
@@ -49,4 +49,4 @@ int main() {
     } catch (...) {
         std::cout << "other exception" << std::endl;
     }
-}
\ No newline at end of file
+}
diff --git a/examples/telemetry_client/CMakeLists.txt b/examples/telemetry_client/CMakeLists.txt
index 6172714566..5cf4964e94 100644
--- a/examples/telemetry_client/CMakeLists.txt
+++ b/examples/telemetry_client/CMakeLists.txt
@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
diff --git a/examples/telemetry_client/telemetry_client.cpp b/examples/telemetry_client/telemetry_client.cpp
index 700ca578a7..e1bd1df0e5 100644
--- a/examples/telemetry_client/telemetry_client.cpp
+++ b/examples/telemetry_client/telemetry_client.cpp
@@ -9,24 +9,24 @@
 /**
  * The telemetry client connects to a WebSocket server and sends a message every
  * second containing an integer count. This example can be used as the basis for
- * programs where a client connects and pushes data for logging, stress/load 
+ * programs where a client connects and pushes data for logging, stress/load
  * testing, etc.
  */
 class telemetry_client {
 public:
     typedef websocketpp::client<websocketpp::config::asio_client> client;
     typedef websocketpp::lib::lock_guard<websocketpp::lib::mutex> scoped_lock;
-    
+
     telemetry_client() : m_open(false),m_done(false) {
         // set up access channels to only log interesting things
         m_client.clear_access_channels(websocketpp::log::alevel::all);
         m_client.set_access_channels(websocketpp::log::alevel::connect);
         m_client.set_access_channels(websocketpp::log::alevel::disconnect);
         m_client.set_access_channels(websocketpp::log::alevel::app);
-        
+
         // Initialize the Asio transport policy
         m_client.init_asio();
-        
+
         // Bind the handlers we are using
         using websocketpp::lib::placeholders::_1;
         using websocketpp::lib::bind;
@@ -34,98 +34,98 @@ public:
         m_client.set_close_handler(bind(&telemetry_client::on_close,this,::_1));
         m_client.set_fail_handler(bind(&telemetry_client::on_fail,this,::_1));
     }
-    
+
     // This method will block until the connection is complete
     void run(const std::string & uri) {
     	// Create a new connection to the given URI
         websocketpp::lib::error_code ec;
         client::connection_ptr con = m_client.get_connection(uri, ec);
         if (ec) {
-        	m_client.get_alog().write(websocketpp::log::alevel::app, 
+        	m_client.get_alog().write(websocketpp::log::alevel::app,
                 	"Get Connection Error: "+ec.message());
         	return;
         }
-        
-        // Grab a handle for this connection so we can talk to it in a thread 
+
+        // Grab a handle for this connection so we can talk to it in a thread
         // safe manor after the event loop starts.
         m_hdl = con->get_handle();
-        
+
         // Queue the connection. No DNS queries or network connections will be
         // made until the io_service event loop is run.
         m_client.connect(con);
-        
+
         // Create a thread to run the ASIO io_service event loop
         websocketpp::lib::thread asio_thread(&client::run, &m_client);
-        
+
         // Create a thread to run the telemetry loop
         websocketpp::lib::thread telemetry_thread(&telemetry_client::telemetry_loop,this);
-        
+
         asio_thread.join();
         telemetry_thread.join();
     }
-    
+
     // The open handler will signal that we are ready to start sending telemetry
     void on_open(websocketpp::connection_hdl hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app, 
+        m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection opened, starting telemetry!");
-        
+
         scoped_lock guard(m_lock);
         m_open = true;
     }
-    
+
     // The close handler will signal that we should stop sending telemetry
     void on_close(websocketpp::connection_hdl hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app, 
+        m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection closed, stopping telemetry!");
-        
+
         scoped_lock guard(m_lock);
         m_done = true;
     }
-    
+
     // The fail handler will signal that we should stop sending telemetry
     void on_fail(websocketpp::connection_hdl hdl) {
-        m_client.get_alog().write(websocketpp::log::alevel::app, 
+        m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection failed, stopping telemetry!");
-        
+
         scoped_lock guard(m_lock);
         m_done = true;
     }
-    
+
     void telemetry_loop() {
         uint64_t count = 0;
         std::stringstream val;
         websocketpp::lib::error_code ec;
-        
+
         while(1) {
             {
                 scoped_lock guard(m_lock);
                 // If the connection has been closed, stop generating telemetry
                 if (m_done) {break;}
-                
+
                 // If the connection hasn't been opened yet wait a bit and retry
                 if (!m_open) {
                     sleep(1);
                     continue;
                 }
             }
-            
+
             val.str("");
             val << "count is " << count++;
-        
+
             m_client.get_alog().write(websocketpp::log::alevel::app, val.str());
             m_client.send(m_hdl,val.str(),websocketpp::frame::opcode::text,ec);
-            
+
             // The most likely error that we will get is that the connection is
-            // not in the right state. Usually this means we tried to send a 
-            // message to a connection that was closed or in the process of 
-            // closing. While many errors here can be easily recovered from, 
+            // not in the right state. Usually this means we tried to send a
+            // message to a connection that was closed or in the process of
+            // closing. While many errors here can be easily recovered from,
             // in this simple example, we'll stop the telemetry loop.
             if (ec) {
-                m_client.get_alog().write(websocketpp::log::alevel::app, 
+                m_client.get_alog().write(websocketpp::log::alevel::app,
                 	"Send Error: "+ec.message());
                 break;
             }
-        
+
             sleep(1);
         }
     }
@@ -139,12 +139,12 @@ private:
 
 int main(int argc, char* argv[]) {
     telemetry_client c;
-    
+
     std::string uri = "ws://localhost:9002";
-    
+
     if (argc == 2) {
         uri = argv[1];
     }
-    
+
     c.run(uri);
 }
diff --git a/examples/testee_client/CMakeLists.txt b/examples/testee_client/CMakeLists.txt
index da24203b1f..a6ca6dd35f 100644
--- a/examples/testee_client/CMakeLists.txt
+++ b/examples/testee_client/CMakeLists.txt
@@ -1,4 +1,4 @@
-    
+
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
diff --git a/examples/testee_client/testee_client.cpp b/examples/testee_client/testee_client.cpp
index 6bdc706241..d2e0545b10 100644
--- a/examples/testee_client/testee_client.cpp
+++ b/examples/testee_client/testee_client.cpp
@@ -17,9 +17,9 @@ int case_count = 0;
 
 void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
     client::connection_ptr con = c->get_con_from_hdl(hdl);
-    
+
     if (con->get_resource() == "/getCaseCount") {
-        std::cout << "Detected " << msg->get_payload() << " test cases." 
+        std::cout << "Detected " << msg->get_payload() << " test cases."
                   << std::endl;
         case_count = atoi(msg->get_payload().c_str());
     } else {
@@ -30,50 +30,50 @@ void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
 int main(int argc, char* argv[]) {
 	// Create a server endpoint
     client c;
-	
+
 	std::string uri = "ws://localhost:9001";
-	
+
 	if (argc == 2) {
 	    uri = argv[1];
 	}
-	
+
 	try {
         // We expect there to be a lot of errors, so suppress them
         c.clear_access_channels(websocketpp::log::alevel::all);
         c.clear_error_channels(websocketpp::log::elevel::all);
-        
+
         // Initialize ASIO
         c.init_asio();
-        
+
         // Register our handlers
         c.set_message_handler(bind(&on_message,&c,::_1,::_2));
-        
+
         websocketpp::lib::error_code ec;
         client::connection_ptr con = c.get_connection(uri+"/getCaseCount", ec);
         c.connect(con);
-	    
+
 	    // Start the ASIO io_service run loop
         c.run();
-        
+
         std::cout << "case count: " << case_count << std::endl;
-        
+
         for (int i = 1; i <= case_count; i++) {
             c.reset();
-            
+
             std::stringstream url;
-            
-            url << uri << "/runCase?case=" << i << "&agent=" 
+
+            url << uri << "/runCase?case=" << i << "&agent="
                 << websocketpp::user_agent;
-            
+
             con = c.get_connection(url.str(), ec);
-                        
+
             c.connect(con);
-            
+
             c.run();
         }
-        
+
         std::cout << "done" << std::endl;
-        
+
     } catch (const std::exception & e) {
         std::cout << e.what() << std::endl;
     } catch (websocketpp::lib::error_code e) {
diff --git a/examples/utility_client/utility_client.cpp b/examples/utility_client/utility_client.cpp
index 2f6320b034..64282fe656 100644
--- a/examples/utility_client/utility_client.cpp
+++ b/examples/utility_client/utility_client.cpp
@@ -14,7 +14,7 @@ typedef websocketpp::client<websocketpp::config::asio_tls_client> client;
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind; 
+using websocketpp::lib::bind;
 
 // pull out the type of messages sent by our config
 typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
@@ -27,14 +27,14 @@ class perftest {
 public:
     typedef perftest type;
     typedef std::chrono::duration<int,std::micro> dur_type;
-    
+
     perftest () {
         m_endpoint.set_access_channels(websocketpp::log::alevel::all);
         m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-        
+
         // Initialize ASIO
         m_endpoint.init_asio();
-        
+
         // Register our handlers
         m_endpoint.set_socket_init_handler(bind(&type::on_socket_init,this,::_1));
         m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
@@ -42,28 +42,28 @@ public:
         m_endpoint.set_open_handler(bind(&type::on_open,this,::_1));
         m_endpoint.set_close_handler(bind(&type::on_close,this,::_1));
     }
-    
+
     void start(std::string uri) {
         websocketpp::lib::error_code ec;
         client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-        
+
         if (ec) {
         	m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
         }
-        
+
         //con->set_proxy("http://humupdates.uchicago.edu:8443");
-        
+
         m_endpoint.connect(con);
-	    
+
 	    // Start the ASIO io_service run loop
 	    m_start = std::chrono::high_resolution_clock::now();
         m_endpoint.run();
     }
-    
+
     void on_socket_init(websocketpp::connection_hdl hdl) {
         m_socket_init = std::chrono::high_resolution_clock::now();
     }
-    
+
     context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
         m_tls_init = std::chrono::high_resolution_clock::now();
         context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
@@ -77,7 +77,7 @@ public:
         }
         return ctx;
     }
-    
+
     void on_open(websocketpp::connection_hdl hdl) {
         m_open = std::chrono::high_resolution_clock::now();
         m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
@@ -88,7 +88,7 @@ public:
     }
     void on_close(websocketpp::connection_hdl hdl) {
         m_close = std::chrono::high_resolution_clock::now();
-                
+
         std::cout << "Socket Init: " << std::chrono::duration_cast<dur_type>(m_socket_init-m_start).count() << std::endl;
         std::cout << "TLS Init: " << std::chrono::duration_cast<dur_type>(m_tls_init-m_start).count() << std::endl;
         std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
@@ -97,7 +97,7 @@ public:
     }
 private:
     client m_endpoint;
-    
+
     std::chrono::high_resolution_clock::time_point m_start;
     std::chrono::high_resolution_clock::time_point m_socket_init;
     std::chrono::high_resolution_clock::time_point m_tls_init;
@@ -108,11 +108,11 @@ private:
 
 int main(int argc, char* argv[]) {
 	std::string uri = "wss://echo.websocket.org";
-	
+
 	if (argc == 2) {
 	    uri = argv[1];
 	}
-	
+
 	try {
         perftest endpoint;
         endpoint.start(uri);
diff --git a/readme.md b/readme.md
index 5db93361b8..0c36a8a9e9 100644
--- a/readme.md
+++ b/readme.md
@@ -22,22 +22,22 @@ Get Involved
 
 [![Build Status](https://travis-ci.org/zaphoyd/websocketpp.png)](https://travis-ci.org/zaphoyd/websocketpp)
 
-**Project Website**  
+**Project Website**
 http://www.zaphoyd.com/websocketpp/
 
-**User Manual**  
+**User Manual**
 http://www.zaphoyd.com/websocketpp/manual/
 
-**GitHub Repository**  
+**GitHub Repository**
 https://github.com/zaphoyd/websocketpp/
 
-**Announcements Mailing List**  
+**Announcements Mailing List**
 http://groups.google.com/group/websocketpp-announcements/
 
-**IRC Channel**  
+**IRC Channel**
  #websocketpp (freenode)
 
-**Discussion / Development / Support Mailing List / Forum**  
+**Discussion / Development / Support Mailing List / Forum**
 http://groups.google.com/group/websocketpp/
 
 Author
diff --git a/test/connection/connection.cpp b/test/connection/connection.cpp
index a400020b4c..c8f7db02e1 100644
--- a/test/connection/connection.cpp
+++ b/test/connection/connection.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE connection
@@ -30,15 +30,15 @@
 
 #include "connection_tu2.hpp"
 
-// NOTE: these tests currently test against hardcoded output values. I am not 
-// sure how problematic this will be. If issues arise like order of headers the 
+// NOTE: these tests currently test against hardcoded output values. I am not
+// sure how problematic this will be. If issues arise like order of headers the
 // output should be parsed by http::response and have values checked directly
 
 BOOST_AUTO_TEST_CASE( basic_http_request ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 426 Upgrade Required\r\nServer: " + 
+    std::string output = "HTTP/1.1 426 Upgrade Required\r\nServer: " +
 		                 std::string(websocketpp::user_agent)+"\r\n\r\n";
-	
+
 	std::string o2 = run_server_test(input);
 
     BOOST_CHECK(o2 == output);
@@ -46,15 +46,15 @@ BOOST_AUTO_TEST_CASE( basic_http_request ) {
 
 struct connection_extension {
     connection_extension() : extension_value(5) {}
-    
+
     int extension_method() {
         return extension_value;
     }
-    
+
     bool is_server() const {
         return false;
     }
-    
+
     int extension_value;
 };
 
@@ -72,17 +72,17 @@ struct stub_config : public websocketpp::config::core {
     typedef core::elog_type elog_type;
 
     typedef core::rng_type rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef core::endpoint_base endpoint_base;
     typedef connection_extension connection_base;
 };
 
 struct connection_setup {
-    connection_setup(bool server) 
+    connection_setup(bool server)
       : c(server,"",alog,elog,rng) {}
-    
+
     websocketpp::lib::error_code ec;
 	stub_config::alog_type alog;
     stub_config::elog_type elog;
@@ -106,19 +106,19 @@ bool validate_set_ua(server* s, websocketpp::connection_hdl hdl) {
 
 void http_func(server* s, websocketpp::connection_hdl hdl) {
     server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
+
     std::string res = con->get_resource();
-    
+
     con->set_body(res);
     con->set_status(websocketpp::http::status_code::ok);
 }
 
 BOOST_AUTO_TEST_CASE( connection_extensions ) {
     connection_setup env(true);
-    
+
     BOOST_CHECK( env.c.extension_value == 5 );
     BOOST_CHECK( env.c.extension_method() == 5 );
-    
+
     BOOST_CHECK( env.c.is_server() == true );
 }
 
@@ -127,10 +127,10 @@ BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: ";
     output+=websocketpp::user_agent;
     output+="\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	server s;
 	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-	
+
     BOOST_CHECK(run_server_test(s,input) == output);
 }
 
@@ -139,56 +139,56 @@ BOOST_AUTO_TEST_CASE( http_request ) {
     std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
     output+=websocketpp::user_agent;
     output+="\r\n\r\n/foo/bar";
-	
+
 	server s;
 	s.set_http_handler(bind(&http_func,&s,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
 BOOST_AUTO_TEST_CASE( request_no_server_header ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	server s;
 	s.set_user_agent("");
 	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
 BOOST_AUTO_TEST_CASE( request_no_server_header_override ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	server s;
 	s.set_user_agent("");
 	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
 	s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
 BOOST_AUTO_TEST_CASE( basic_client_websocket ) {
     std::string uri = "ws://localhost";
-    
+
     //std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string ref = "GET / HTTP/1.1\r\nConnection: Upgrade\r\nHost: localhost\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\nSec-WebSocket-Version: 13\r\nUpgrade: websocket\r\nUser-Agent: foo\r\n\r\n";
-	
+
 	std::stringstream output;
-	
+
 	client e;
 	e.set_access_channels(websocketpp::log::alevel::none);
     e.set_error_channels(websocketpp::log::elevel::none);
 	e.set_user_agent("foo");
 	e.register_ostream(&output);
-	
+
 	client::connection_ptr con;
 	websocketpp::lib::error_code ec;
 	con = e.get_connection(uri, ec);
 	e.connect(con);
-	
+
     BOOST_CHECK_EQUAL(ref, output.str());
 }
 
@@ -197,16 +197,16 @@ BOOST_AUTO_TEST_CASE( basic_client_websocket ) {
 BOOST_AUTO_TEST_CASE( user_reject_origin ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
     std::string output = "HTTP/1.1 403 Forbidden\r\nServer: "+websocketpp::USER_AGENT+"\r\n\r\n";
-	    
+
     BOOST_CHECK(run_server_test(input) == output);
 }
 
 BOOST_AUTO_TEST_CASE( basic_text_message ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-    
+
 	unsigned char frames[8] = {0x82,0x82,0xFF,0xFF,0xFF,0xFF,0xD5,0xD5};
 	input.append(reinterpret_cast<char*>(frames),8);
-	
+
 	std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: "+websocketpp::USER_AGENT+"\r\nUpgrade: websocket\r\n\r\n**";
 
     BOOST_CHECK( run_server_test(input) == output);
diff --git a/test/connection/connection_tu2.cpp b/test/connection/connection_tu2.cpp
index 3046295bdb..ee0d6a9803 100644
--- a/test/connection/connection_tu2.cpp
+++ b/test/connection/connection_tu2.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include "connection_tu2.hpp"
@@ -39,19 +39,19 @@ std::string run_server_test(std::string input) {
 std::string run_server_test(server & s, std::string input) {
     server::connection_ptr con;
     std::stringstream output;
-	
+
 	s.clear_access_channels(websocketpp::log::alevel::all);
     s.clear_error_channels(websocketpp::log::elevel::all);
-	
+
 	s.register_ostream(&output);
-	
+
 	con = s.get_connection();
 	con->start();
-	
+
 	std::stringstream channel;
-	
+
 	channel << input;
 	channel >> *con;
-	
+
 	return output.str();
-}
\ No newline at end of file
+}
diff --git a/test/connection/connection_tu2.hpp b/test/connection/connection_tu2.hpp
index f0c7c3803f..b4e95216da 100644
--- a/test/connection/connection_tu2.hpp
+++ b/test/connection/connection_tu2.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include <iostream>
@@ -36,7 +36,7 @@
 
 typedef websocketpp::server<websocketpp::config::core> server;
 /// NOTE: the "server" config is being used for the client here because we don't
-/// want to pull in the real RNG. A better way to do this might be a custom 
+/// want to pull in the real RNG. A better way to do this might be a custom
 /// client config with the RNG explicitly stubbed out.
 typedef websocketpp::client<websocketpp::config::core> client;
 typedef websocketpp::config::core::message_type::ptr message_ptr;
@@ -47,4 +47,4 @@ using websocketpp::lib::bind;
 
 void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg);
 std::string run_server_test(std::string input);
-std::string run_server_test(server & s, std::string input);
\ No newline at end of file
+std::string run_server_test(server & s, std::string input);
diff --git a/test/endpoint/endpoint.cpp b/test/endpoint/endpoint.cpp
index a4ed10835a..da3c839ca4 100644
--- a/test/endpoint/endpoint.cpp
+++ b/test/endpoint/endpoint.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE endpoint
@@ -59,15 +59,15 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) {
 
 struct endpoint_extension {
     endpoint_extension() : extension_value(5) {}
-    
+
     int extension_method() {
         return extension_value;
     }
-    
+
     bool is_server() const {
         return false;
     }
-    
+
     int extension_value;
 };
 
@@ -85,17 +85,17 @@ struct stub_config : public websocketpp::config::core {
     typedef core::elog_type elog_type;
 
     typedef core::rng_type rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef endpoint_extension endpoint_base;
 };
 
 BOOST_AUTO_TEST_CASE( endpoint_extensions ) {
     websocketpp::server<stub_config> s;
-    
+
     BOOST_CHECK( s.extension_value == 5 );
     BOOST_CHECK( s.extension_method() == 5 );
-    
+
     BOOST_CHECK( s.is_server() == true );
 }
diff --git a/test/extension/extension.cpp b/test/extension/extension.cpp
index 63f46cf9c0..5439c0741e 100644
--- a/test/extension/extension.cpp
+++ b/test/extension/extension.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE extension
diff --git a/test/extension/permessage_deflate.cpp b/test/extension/permessage_deflate.cpp
index 67509fd20b..60e3c24d57 100644
--- a/test/extension/permessage_deflate.cpp
+++ b/test/extension/permessage_deflate.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE permessage_deflate
@@ -83,8 +83,8 @@ BOOST_AUTO_TEST_CASE( enabled_starts_disabled ) {
 
 BOOST_AUTO_TEST_CASE( negotiation_empty_attr ) {
     ext_vars v;
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
@@ -93,8 +93,8 @@ BOOST_AUTO_TEST_CASE( negotiation_empty_attr ) {
 BOOST_AUTO_TEST_CASE( negotiation_invalid_attr ) {
     ext_vars v;
     v.attr["foo"] = "bar";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( !v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attributes) );
     BOOST_CHECK_EQUAL( v.esp.second, "");
@@ -104,8 +104,8 @@ BOOST_AUTO_TEST_CASE( negotiation_invalid_attr ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_invalid ) {
     ext_vars v;
     v.attr["s2c_no_context_takeover"] = "foo";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( !v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
     BOOST_CHECK_EQUAL( v.esp.second, "");
@@ -114,8 +114,8 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_invalid ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover ) {
     ext_vars v;
     v.attr["s2c_no_context_takeover"] = "";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover");
@@ -123,9 +123,9 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_server_initiated ) {
     ext_vars v;
-    
+
     v.exts.enable_s2c_no_context_takeover();
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover");
@@ -135,8 +135,8 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_server_initiated ) {
 BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_invalid ) {
     ext_vars v;
     v.attr["c2s_no_context_takeover"] = "foo";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( !v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
     BOOST_CHECK_EQUAL( v.esp.second, "");
@@ -145,8 +145,8 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_invalid ) {
 BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover ) {
     ext_vars v;
     v.attr["c2s_no_context_takeover"] = "";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover");
@@ -154,9 +154,9 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_server_initiated ) {
     ext_vars v;
-    
+
     v.exts.enable_c2s_no_context_takeover();
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover");
@@ -166,7 +166,7 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_server_initiated ) {
 // Negotiate s2c_max_window_bits
 BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_invalid ) {
     ext_vars v;
-    
+
     std::vector<std::string> values;
     values.push_back("");
     values.push_back("foo");
@@ -176,8 +176,8 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_invalid ) {
     std::vector<std::string>::const_iterator it;
     for (it = values.begin(); it != values.end(); ++it) {
         v.attr["s2c_max_window_bits"] = *it;
-        
-        v.esp = v.exts.negotiate(v.attr); 
+
+        v.esp = v.exts.negotiate(v.attr);
         BOOST_CHECK( !v.exts.is_enabled() );
         BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
         BOOST_CHECK_EQUAL( v.esp.second, "");
@@ -187,15 +187,15 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_invalid ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_valid ) {
     ext_vars v;
     v.attr["s2c_max_window_bits"] = "8";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
 
     v.attr["s2c_max_window_bits"] = "15";
-    
-    v.esp = v.exts.negotiate(v.attr); 
+
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
@@ -214,9 +214,9 @@ BOOST_AUTO_TEST_CASE( invalid_set_s2c_max_window_bits ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_decline ) {
     ext_vars v;
     v.attr["s2c_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::decline);
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
@@ -226,7 +226,7 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_decline ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_accept ) {
     ext_vars v;
     v.attr["s2c_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::accept);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -238,7 +238,7 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_accept ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_largest ) {
     ext_vars v;
     v.attr["s2c_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::largest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_largest ) {
 BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_smallest ) {
     ext_vars v;
     v.attr["s2c_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::smallest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_smallest ) {
 // Negotiate s2c_max_window_bits
 BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_invalid ) {
     ext_vars v;
-    
+
     std::vector<std::string> values;
     values.push_back("foo");
     values.push_back("7");
@@ -271,8 +271,8 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_invalid ) {
     std::vector<std::string>::const_iterator it;
     for (it = values.begin(); it != values.end(); ++it) {
         v.attr["c2s_max_window_bits"] = *it;
-        
-        v.esp = v.exts.negotiate(v.attr); 
+
+        v.esp = v.exts.negotiate(v.attr);
         BOOST_CHECK( !v.exts.is_enabled() );
         BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
         BOOST_CHECK_EQUAL( v.esp.second, "");
@@ -283,19 +283,19 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_valid ) {
     ext_vars v;
 
     v.attr["c2s_max_window_bits"] = "";
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
 
     v.attr["c2s_max_window_bits"] = "8";
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
 
     v.attr["c2s_max_window_bits"] = "15";
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
@@ -314,9 +314,9 @@ BOOST_AUTO_TEST_CASE( invalid_set_c2s_max_window_bits ) {
 BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_decline ) {
     ext_vars v;
     v.attr["c2s_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_c2s_max_window_bits(8,pmd_mode::decline);
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
@@ -326,7 +326,7 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_decline ) {
 BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_accept ) {
     ext_vars v;
     v.attr["c2s_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::accept);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_accept ) {
 BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_largest ) {
     ext_vars v;
     v.attr["c2s_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::largest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -350,7 +350,7 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_largest ) {
 BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_smallest ) {
     ext_vars v;
     v.attr["c2s_max_window_bits"] = "8";
-    
+
     v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::smallest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -363,11 +363,11 @@ BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_smallest ) {
 // Combinations with 2
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated1 ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["c2s_no_context_takeover"] = "";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover");
@@ -375,11 +375,11 @@ BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated1 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated2 ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["s2c_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; s2c_max_window_bits=10");
@@ -387,11 +387,11 @@ BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated2 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated3 ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_max_window_bits=10");
@@ -399,11 +399,11 @@ BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated3 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated4 ) {
     ext_vars v;
-    
+
     v.attr["c2s_no_context_takeover"] = "";
     v.attr["s2c_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; s2c_max_window_bits=10");
@@ -411,11 +411,11 @@ BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated4 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated5 ) {
     ext_vars v;
-    
+
     v.attr["c2s_no_context_takeover"] = "";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; c2s_max_window_bits=10");
@@ -423,11 +423,11 @@ BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated5 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated6 ) {
     ext_vars v;
-    
+
     v.attr["s2c_max_window_bits"] = "10";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=10; c2s_max_window_bits=10");
@@ -435,12 +435,12 @@ BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated6 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated1 ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["c2s_no_context_takeover"] = "";
     v.attr["s2c_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; s2c_max_window_bits=10");
@@ -448,12 +448,12 @@ BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated1 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated2 ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["c2s_no_context_takeover"] = "";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; c2s_max_window_bits=10");
@@ -461,12 +461,12 @@ BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated2 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated3 ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["s2c_max_window_bits"] = "10";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
@@ -474,12 +474,12 @@ BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated3 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated4 ) {
     ext_vars v;
-    
+
     v.attr["c2s_no_context_takeover"] = "";
     v.attr["s2c_max_window_bits"] = "10";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
@@ -487,13 +487,13 @@ BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated4 ) {
 
 BOOST_AUTO_TEST_CASE( negotiate_four_client_initiated ) {
     ext_vars v;
-    
+
     v.attr["s2c_no_context_takeover"] = "";
     v.attr["c2s_no_context_takeover"] = "";
     v.attr["s2c_max_window_bits"] = "10";
     v.attr["c2s_max_window_bits"] = "10";
 
-    v.esp = v.exts.negotiate(v.attr); 
+    v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
@@ -503,16 +503,16 @@ BOOST_AUTO_TEST_CASE( negotiate_four_client_initiated ) {
 /*
 BOOST_AUTO_TEST_CASE( compress_data ) {
     ext_vars v;
-    
+
     std::string in = "Hello";
     std::string out;
     std::string in2;
     std::string out2;
-    
+
     v.exts.init();
 
     v.ec = v.exts.compress(in,out);
-    
+
     std::cout << "in : " << websocketpp::utility::to_hex(in) << std::endl;
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     std::cout << "out: " << websocketpp::utility::to_hex(out) << std::endl;
@@ -520,7 +520,7 @@ BOOST_AUTO_TEST_CASE( compress_data ) {
     in2 = out;
 
     v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(in2.data()),in2.size(),out2);
-    
+
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     std::cout << "out: " << websocketpp::utility::to_hex(out2) << std::endl;
     BOOST_CHECK_EQUAL( out, out2 );
@@ -528,16 +528,16 @@ BOOST_AUTO_TEST_CASE( compress_data ) {
 
 BOOST_AUTO_TEST_CASE( decompress_data ) {
     ext_vars v;
-    
+
     uint8_t in[12] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff};
     std::string out;
-    
+
     v.exts.init();
 
     v.ec = v.exts.decompress(in,12,out);
-    
+
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     std::cout << "out: " << websocketpp::utility::to_hex(out) << std::endl;
     BOOST_CHECK( false );
 }
-*/
\ No newline at end of file
+*/
diff --git a/test/http/parser.cpp b/test/http/parser.cpp
index 57a1de6fc5..19a4909e79 100644
--- a/test/http/parser.cpp
+++ b/test/http/parser.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE http_parser
@@ -35,7 +35,7 @@
 
 BOOST_AUTO_TEST_CASE( is_token_char ) {
     // Valid characters
-    
+
     // misc
     BOOST_CHECK( websocketpp::http::is_token_char('!') );
     BOOST_CHECK( websocketpp::http::is_token_char('#') );
@@ -51,29 +51,29 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
     BOOST_CHECK( websocketpp::http::is_token_char('_') );
     BOOST_CHECK( websocketpp::http::is_token_char('`') );
     BOOST_CHECK( websocketpp::http::is_token_char('~') );
-    
+
     // numbers
     for (int i = 0x30; i < 0x3a; i++) {
     	BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // upper
     for (int i = 0x41; i < 0x5b; i++) {
     	BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // lower
     for (int i = 0x61; i < 0x7b; i++) {
     	BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // invalid characters
-    
+
     // lower unprintable
     for (int i = 0; i < 33; i++) {
     	BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // misc
     BOOST_CHECK( !websocketpp::http::is_token_char('(') );
     BOOST_CHECK( !websocketpp::http::is_token_char(')') );
@@ -92,12 +92,12 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
     BOOST_CHECK( !websocketpp::http::is_token_char('=') );
     BOOST_CHECK( !websocketpp::http::is_token_char('{') );
     BOOST_CHECK( !websocketpp::http::is_token_char('}') );
-    
+
     // upper unprintable and out of ascii range
     for (int i = 127; i < 256; i++) {
     	BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
     }
-    
+
     // is not
     BOOST_CHECK( !websocketpp::http::is_not_token_char('!') );
     BOOST_CHECK( websocketpp::http::is_not_token_char('(') );
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE( extract_quoted_string ) {
     std::string d5 = "foo";
 
     std::pair<std::string,std::string::const_iterator> ret;
-    
+
     using websocketpp::http::parser::extract_quoted_string;
 
     ret = extract_quoted_string(d1.begin(),d1.end());
@@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE( extract_all_lws ) {
     std::string d1 = " foo     bar";
     d1.append(1,char(9));
     d1.append("baz\r\n d\r\n  \r\n  e\r\nf");
-    
+
     std::string::const_iterator ret;
 
     ret = websocketpp::http::parser::extract_all_lws(d1.begin(),d1.end());
@@ -227,33 +227,33 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     websocketpp::http::parameter_list p;
     websocketpp::http::attribute_list a;
     std::string::const_iterator it;
-    
+
     using websocketpp::http::parser::extract_parameters;
 
     it = extract_parameters(s1.begin(),s1.end(),p);
     BOOST_CHECK( it == s1.begin() );
-    
+
     p.clear();
     it = extract_parameters(s2.begin(),s2.end(),p);
     BOOST_CHECK( it == s2.end() );
     BOOST_CHECK_EQUAL( p.size(), 1 );
     BOOST_CHECK( p[0].first == "foo" );
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s3.begin(),s3.end(),p);
     BOOST_CHECK( it == s3.begin()+5 );
     BOOST_CHECK_EQUAL( p.size(), 1 );
     BOOST_CHECK( p[0].first == "foo" );
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s4.begin(),s4.end(),p);
     BOOST_CHECK( it == s4.end() );
     BOOST_CHECK_EQUAL( p.size(), 1 );
     BOOST_CHECK( p[0].first == "foo" );
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s5.begin(),s5.end(),p);
     BOOST_CHECK( it == s5.end() );
@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
     BOOST_CHECK( p[1].first == "bar" );
     BOOST_CHECK_EQUAL( p[1].second.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s6.begin(),s6.end(),p);
     BOOST_CHECK( it == s6.end() );
@@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.size(), 1 );
     BOOST_CHECK( a.find("bar") != a.end() );
     BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
-    
+
     p.clear();
     it = extract_parameters(s7.begin(),s7.end(),p);
     BOOST_CHECK( it == s7.end() );
@@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK( p[1].first == "bar" );
     a = p[1].second;
     BOOST_CHECK_EQUAL( a.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s8.begin(),s8.end(),p);
     BOOST_CHECK( it == s8.end() );
@@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
     BOOST_CHECK( a.find("baz") != a.end() );
     BOOST_CHECK_EQUAL( a.find("baz")->second, "" );
-    
+
     p.clear();
     it = extract_parameters(s9.begin(),s9.end(),p);
     BOOST_CHECK( it == s9.end() );
@@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.size(), 1 );
     BOOST_CHECK( a.find("bar") != a.end() );
     BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
-    
+
     p.clear();
     it = extract_parameters(s10.begin(),s10.end(),p);
     BOOST_CHECK( it == s10.end() );
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
     BOOST_CHECK( a.find("boo") != a.end() );
     BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
-    
+
     p.clear();
     it = extract_parameters(s11.begin(),s11.end(),p);
     BOOST_CHECK( it == s11.end() );
@@ -333,7 +333,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
     a = p[1].second;
     BOOST_CHECK_EQUAL( a.size(), 0 );
-    
+
     p.clear();
     it = extract_parameters(s12.begin(),s12.end(),p);
     BOOST_CHECK( it == s12.end() );
@@ -343,7 +343,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.size(), 1 );
     BOOST_CHECK( a.find("bar") != a.end() );
     BOOST_CHECK_EQUAL( a.find("bar")->second, "a b c" );
-    
+
     p.clear();
     it = extract_parameters(s13.begin(),s13.end(),p);
     BOOST_CHECK( it == s13.end() );
@@ -357,7 +357,7 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
 
 BOOST_AUTO_TEST_CASE( case_insensitive_headers ) {
     websocketpp::http::parser::parser r;
-    
+
     r.replace_header("foo","bar");
 
     BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
@@ -367,89 +367,89 @@ BOOST_AUTO_TEST_CASE( case_insensitive_headers ) {
 
 BOOST_AUTO_TEST_CASE( case_insensitive_headers_overwrite ) {
     websocketpp::http::parser::parser r;
-    
+
     r.replace_header("foo","bar");
 
     BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
     BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
-    
+
     r.replace_header("Foo","baz");
-    
+
     BOOST_CHECK_EQUAL( r.get_header("foo"), "baz" );
     BOOST_CHECK_EQUAL( r.get_header("Foo"), "baz" );
-    
+
     r.remove_header("FoO");
-    
+
     BOOST_CHECK_EQUAL( r.get_header("foo"), "" );
     BOOST_CHECK_EQUAL( r.get_header("Foo"), "" );
 }
 
 BOOST_AUTO_TEST_CASE( blank_consume ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( r.ready() == false );
 }
 
 BOOST_AUTO_TEST_CASE( blank_request ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
     BOOST_CHECK( r.ready() == false );
 }
 
 BOOST_AUTO_TEST_CASE( bad_request_no_host ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
     BOOST_CHECK( r.ready() == false );
 }
 
 BOOST_AUTO_TEST_CASE( basic_request ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -461,18 +461,18 @@ BOOST_AUTO_TEST_CASE( basic_request ) {
 
 BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\na";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -484,13 +484,13 @@ BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
 
 BOOST_AUTO_TEST_CASE( basic_split1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\n";
     std::string raw2 = "Host: www.example.com\r\n\r\na";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     	pos += r.consume(raw2.c_str(),raw2.size());
@@ -498,7 +498,7 @@ BOOST_AUTO_TEST_CASE( basic_split1 ) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -510,13 +510,13 @@ BOOST_AUTO_TEST_CASE( basic_split1 ) {
 
 BOOST_AUTO_TEST_CASE( basic_split2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r";
     std::string raw2 = "\n\r\na";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     	pos += r.consume(raw2.c_str(),raw2.size());
@@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE( basic_split2 ) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -536,12 +536,12 @@ BOOST_AUTO_TEST_CASE( basic_split2 ) {
 
 BOOST_AUTO_TEST_CASE( max_header_len ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw(websocketpp::http::max_header_size+1,'*');
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (const websocketpp::http::exception& e) {
@@ -549,19 +549,19 @@ BOOST_AUTO_TEST_CASE( max_header_len ) {
     		exception = true;
     	}
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( max_header_len_split ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw(websocketpp::http::max_header_size-1,'*');
     std::string raw2(2,'*');
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     	pos += r.consume(raw2.c_str(),raw2.size());
@@ -570,24 +570,24 @@ BOOST_AUTO_TEST_CASE( max_header_len_split ) {
     		exception = true;
     	}
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( firefox_full_request ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 482 );
     BOOST_CHECK( r.ready() == true );
@@ -610,50 +610,50 @@ BOOST_AUTO_TEST_CASE( firefox_full_request ) {
 
 BOOST_AUTO_TEST_CASE( bad_method ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GE]T / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( bad_header_name ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHo]st: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
-    
+
     try {
     	r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.0\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
@@ -665,18 +665,18 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 
 BOOST_AUTO_TEST_CASE( new_http_version1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.12\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 42 );
     BOOST_CHECK( r.ready() == true );
@@ -688,18 +688,18 @@ BOOST_AUTO_TEST_CASE( new_http_version1 ) {
 
 BOOST_AUTO_TEST_CASE( new_http_version2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/12.12\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 43 );
     BOOST_CHECK( r.ready() == true );
@@ -713,35 +713,35 @@ BOOST_AUTO_TEST_CASE( new_http_version2 ) {
 
 BOOST_AUTO_TEST_CASE( new_http_version3 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTPS/12.12\r\nHost: www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == true );
 }
 
 BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost:  www.example.com \r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 43 );
     BOOST_CHECK( r.ready() == true );
@@ -753,18 +753,18 @@ BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
 
 BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost:www.example.com\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 40 );
     BOOST_CHECK( r.ready() == true );
@@ -776,18 +776,18 @@ BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
 
 BOOST_AUTO_TEST_CASE( header_aggregation ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nFoo: bar\r\nFoo: bat\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
     	exception = true;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 61 );
     BOOST_CHECK( r.ready() == true );
@@ -799,19 +799,19 @@ BOOST_AUTO_TEST_CASE( header_aggregation ) {
 
 BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
     websocketpp::http::parser::response r;
-    
+
     std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 159 );
     BOOST_CHECK( r.headers_ready() == true );
@@ -826,19 +826,19 @@ BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
 
 BOOST_AUTO_TEST_CASE( plain_http_response ) {
     websocketpp::http::parser::response r;
-    
+
     std::string raw = "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK( exception == false );
     BOOST_CHECK( pos == 405 );
     BOOST_CHECK( r.headers_ready() == true );
@@ -859,21 +859,21 @@ BOOST_AUTO_TEST_CASE( plain_http_response ) {
 
 BOOST_AUTO_TEST_CASE( parse_istream ) {
     websocketpp::http::parser::response r;
-    
+
     std::stringstream s;
-    
+
     s << "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
-    
+
     bool exception = false;
     size_t pos = 0;
-    
+
     try {
     	pos += r.consume(s);
     } catch (std::exception &e) {
     	exception = true;
     	std::cout << e.what() << std::endl;
     }
-    
+
     BOOST_CHECK_EQUAL( exception, false );
     BOOST_CHECK_EQUAL( pos, 405 );
     BOOST_CHECK_EQUAL( r.headers_ready(), true );
@@ -882,40 +882,40 @@ BOOST_AUTO_TEST_CASE( parse_istream ) {
 
 BOOST_AUTO_TEST_CASE( write_request_basic ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\n\r\n";
-    
+
     r.set_version("HTTP/1.1");
     r.set_method("GET");
     r.set_uri("/");
-    
+
     BOOST_CHECK( r.raw() == raw );
 }
 
 BOOST_AUTO_TEST_CASE( write_request_with_header ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "GET / HTTP/1.1\r\nHost: http://example.com\r\n\r\n";
-    
+
     r.set_version("HTTP/1.1");
     r.set_method("GET");
     r.set_uri("/");
     r.replace_header("Host","http://example.com");
-    
+
     BOOST_CHECK( r.raw() == raw );
 }
 
 BOOST_AUTO_TEST_CASE( write_request_with_body ) {
     websocketpp::http::parser::request r;
-    
+
     std::string raw = "POST / HTTP/1.1\r\nContent-Length: 48\r\nContent-Type: application/x-www-form-urlencoded\r\nHost: http://example.com\r\n\r\nlicenseID=string&content=string&paramsXML=string";
-    
+
     r.set_version("HTTP/1.1");
     r.set_method("POST");
     r.set_uri("/");
     r.replace_header("Host","http://example.com");
     r.replace_header("Content-Type","application/x-www-form-urlencoded");
     r.set_body("licenseID=string&content=string&paramsXML=string");
-    
+
     BOOST_CHECK( r.raw() == raw );
 }
diff --git a/test/http/parser_perf.cpp b/test/http/parser_perf.cpp
index fe3ed1a1e3..9e3d2b5c87 100644
--- a/test/http/parser_perf.cpp
+++ b/test/http/parser_perf.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #include <websocketpp/http/parser.hpp>
@@ -36,18 +36,18 @@ public:
 	}
 	~scoped_timer() {
 		std::chrono::nanoseconds time_taken = std::chrono::steady_clock::now()-m_start;
-		
+
 		//nanoseconds_per_test
-		
+
 		//tests_per_second
-		
+
 		//1000000000.0/(double(time_taken.count())/1000.0)
-		
+
 		std::cout << 1000000000.0/(double(time_taken.count())/1000.0) << std::endl;
-		
+
 		//std::cout << (1.0/double(time_taken.count())) * double(1000000000*1000) << std::endl;
 	}
-	
+
 private:
 	std::string m_id;
 	std::chrono::steady_clock::time_point m_start;
@@ -55,87 +55,87 @@ private:
 
 int main() {
 	std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-	
+
 	std::string firefox = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string firefox1 = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\n";
-	
+
 	std::string firefox2 = "Accept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
-	
-	{	
+
+	{
 		scoped_timer timer("Simplest 1 chop");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume(raw.c_str(),raw.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
-	{	
+
+	{
 		scoped_timer timer("FireFox, 1 chop, consume old");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume2(firefox.c_str(),firefox.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
-	{	
+
+	{
 		scoped_timer timer("FireFox, 1 chop");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume(firefox.c_str(),firefox.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
-	
-	
-	{	
+
+
+
+	{
 		scoped_timer timer("FireFox, 2 chop");
 		for (int i = 0; i < 1000; i++) {
 			websocketpp::http::parser::request r;
-			
+
 			try {
 				r.consume(firefox1.c_str(),firefox1.size());
 				r.consume(firefox2.c_str(),firefox2.size());
 			} catch (...) {
 				std::cout << "exception" << std::endl;
 			}
-			
+
 			if (!r.ready()) {
 				std::cout << "error" << std::endl;
 				break;
 			}
 		}
 	}
-	
+
 	return 0;
 }
diff --git a/test/logger/basic.cpp b/test/logger/basic.cpp
index ef18ab97d9..f955967a29 100644
--- a/test/logger/basic.cpp
+++ b/test/logger/basic.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE basic_log
@@ -36,16 +36,16 @@
 
 BOOST_AUTO_TEST_CASE( is_token_char ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::elevel> error_log;
-    
+
     error_log elog;
-    
+
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::info ) == true );
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::warn ) == true );
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::rerror ) == true );
     BOOST_CHECK( elog.static_test(websocketpp::log::elevel::fatal ) == true );
-    
+
     elog.set_channels(websocketpp::log::elevel::info);
-    
+
     elog.write(websocketpp::log::elevel::info,"Information");
     elog.write(websocketpp::log::elevel::warn,"A warning");
     elog.write(websocketpp::log::elevel::rerror,"A error");
@@ -54,13 +54,13 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
 
 BOOST_AUTO_TEST_CASE( access_clear ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::alevel> access_log;
-    
+
     std::stringstream out;
     access_log logger(0xffffffff,&out);
-    
+
     // clear all channels
     logger.clear_channels(0xffffffff);
-    
+
     // writes shouldn't happen
     logger.write(websocketpp::log::alevel::devel,"devel");
     //std::cout << "|" << out.str() << "|" << std::endl;
@@ -69,13 +69,13 @@ BOOST_AUTO_TEST_CASE( access_clear ) {
 
 BOOST_AUTO_TEST_CASE( basic_concurrency ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> access_log;
-    
+
     std::stringstream out;
     access_log logger(0xffffffff,&out);
-    
+
     logger.set_channels(0xffffffff);
-        
+
     logger.write(websocketpp::log::alevel::devel,"devel");
     //std::cout << "|" << out.str() << "|" << std::endl;
     BOOST_CHECK( out.str().size() > 0 );
-}
\ No newline at end of file
+}
diff --git a/test/message_buffer/alloc.cpp b/test/message_buffer/alloc.cpp
index c5ead8d644..2a0dc3203c 100644
--- a/test/message_buffer/alloc.cpp
+++ b/test/message_buffer/alloc.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE message_buffer_alloc
@@ -36,7 +36,7 @@
 template <template <class> class con_msg_manager>
 struct stub {
 	typedef websocketpp::lib::shared_ptr<stub> ptr;
-	
+
 	typedef con_msg_manager<stub> con_msg_man_type;
 	typedef typename con_msg_man_type::ptr con_msg_man_ptr;
 	typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
@@ -55,16 +55,16 @@ struct stub {
 			return false;
 		}
 	}
-	
+
 	websocketpp::frame::opcode::value	m_opcode;
 	con_msg_man_weak_ptr	            m_manager;
 	size_t					            m_size;
 };
 
 BOOST_AUTO_TEST_CASE( basic_get_message ) {
-	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager> 
+	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
 		message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_man_type;
 
 	con_msg_man_type::ptr manager(new con_msg_man_type());
@@ -77,13 +77,13 @@ BOOST_AUTO_TEST_CASE( basic_get_message ) {
 }
 
 BOOST_AUTO_TEST_CASE( basic_get_manager ) {
-	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager> 
+	typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
 		message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_man_type;
 	typedef websocketpp::message_buffer::alloc::endpoint_msg_manager
 		<con_msg_man_type> endpoint_manager_type;
-	
+
 	endpoint_manager_type em;
 	con_msg_man_type::ptr manager = em.get_manager();
 	message_type::ptr msg = manager->get_message(websocketpp::frame::opcode::TEXT,512);
diff --git a/test/message_buffer/message.cpp b/test/message_buffer/message.cpp
index 430d7fa77f..2c4b4f628b 100644
--- a/test/message_buffer/message.cpp
+++ b/test/message_buffer/message.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE message
@@ -37,7 +37,7 @@ template <typename message>
 struct stub {
 	typedef websocketpp::lib::weak_ptr<stub> weak_ptr;
 	typedef websocketpp::lib::shared_ptr<stub> ptr;
-	
+
 	stub() : recycled(false) {}
 
 	bool recycle(message * msg) {
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE( basic_size_check ) {
 
 	stub_type::ptr s(new stub_type());
 	message_type::ptr msg(new message_type(s,websocketpp::frame::opcode::TEXT,500));
-	
+
 	BOOST_CHECK(msg->get_payload().capacity() >= 500);
 }
 
diff --git a/test/message_buffer/pool.cpp b/test/message_buffer/pool.cpp
index 696b3ea102..25b07098a6 100644
--- a/test/message_buffer/pool.cpp
+++ b/test/message_buffer/pool.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_00_processor
@@ -40,37 +40,37 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
     websocketpp::http::parser::request r;
     websocketpp::http::parser::response response;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(p.validate_handshake(r));
-    
+
     websocketpp::uri_ptr u;
     bool exception;
-    
+
     try {
     	u = p.get_uri(r);
     } catch (const websocketpp::uri_exception& e) {
     	exception = true;
     }
-    
+
     BOOST_CHECK(exception == false);
     BOOST_CHECK(u->get_secure() == false);
     BOOST_CHECK(u->get_host() == "www.example.com");
     BOOST_CHECK(u->get_resource() == "/");
     BOOST_CHECK(u->get_port() == websocketpp::URI_DEFAULT_PORT);
-    
+
     p.process_handshake(r,response);
-    
+
     BOOST_CHECK(response.get_header("Connection") == "Upgrade");
     BOOST_CHECK(response.get_header("Upgrade") == "websocket");
     BOOST_CHECK(response.get_header("Sec-WebSocket-Origin") == "http://example.com");
-        
+
     BOOST_CHECK(response.get_header("Sec-WebSocket-Location") == "ws://www.example.com/");
     BOOST_CHECK(response.get_header("Sec-WebSocket-Key3") == "n`9eBk9z$R8pOtVb");
 }
@@ -78,12 +78,12 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 BOOST_AUTO_TEST_CASE( non_get_method ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -92,12 +92,12 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 BOOST_AUTO_TEST_CASE( old_http_version ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -106,12 +106,12 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -120,12 +120,12 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
     websocketpp::http::parser::request r;
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
@@ -136,21 +136,21 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
     websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
     websocketpp::uri_ptr u;
     bool exception = false;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
     r.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     BOOST_CHECK(!p.validate_handshake(r));
-    
+
     try {
     	u = p.get_uri(r);
     } catch (const websocketpp::uri_exception& e) {
     	exception = true;
     }
-    
+
     BOOST_CHECK(exception == true);
-}
\ No newline at end of file
+}
diff --git a/test/processors/SConscript b/test/processors/SConscript
index a672963cb3..406a7edc9f 100644
--- a/test/processors/SConscript
+++ b/test/processors/SConscript
@@ -28,7 +28,7 @@ prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension
 
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
-   # no C++11 features are used in processor so there are no C++11 versions of 
+   # no C++11 features are used in processor so there are no C++11 versions of
    # these tests.
    objs += env_cpp11.Object('test_processor_stl.o', ["processor.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('test_hybi13_stl.o', ["hybi13.cpp"], LIBS = BOOST_LIBS_CPP11)
@@ -36,7 +36,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    objs += env_cpp11.Object('test_hybi07_stl.o', ["hybi07.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('test_hybi00_stl.o', ["hybi00.cpp"], LIBS = BOOST_LIBS_CPP11)
    objs += env_cpp11.Object('test_extension_permessage_compress_stl.o', ["extension_permessage_compress.cpp"], LIBS = BOOST_LIBS_CPP11 + ['z'])
-   
+
    prgs += env_cpp11.Program('test_processor_stl', ["test_processor_stl.o"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_hybi13_stl', ["test_hybi13_stl.o"], LIBS = BOOST_LIBS_CPP11)
    prgs += env_cpp11.Program('test_hybi08_stl', ["test_hybi08_stl.o"], LIBS = BOOST_LIBS_CPP11)
diff --git a/test/processors/extension_permessage_compress.cpp b/test/processors/extension_permessage_compress.cpp
index d8e23f62aa..11ba10198e 100644
--- a/test/processors/extension_permessage_compress.cpp
+++ b/test/processors/extension_permessage_compress.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE extension_permessage_deflate
@@ -38,7 +38,7 @@
 struct config {
     typedef websocketpp::http::parser::request request_type;
 };
-typedef websocketpp::extensions::permessage_deflate::enabled<config> 
+typedef websocketpp::extensions::permessage_deflate::enabled<config>
     compressor_type;
 
 using namespace websocketpp;
@@ -50,23 +50,23 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
 
     neg_ret = compressor.negotiate(attributes);
 
-    BOOST_CHECK_EQUAL( neg_ret.first, 
+    BOOST_CHECK_EQUAL( neg_ret.first,
         extensions::permessage_deflate::error::invalid_parameters );*/
-    
+
     /**
      * Window size is primarily controlled by the writer. A stream can only be
      * read by a window size equal to or greater than the one use to compress
-     * it initially. The default windows size is also the maximum window size. 
+     * it initially. The default windows size is also the maximum window size.
      * Thus:
      *
      * Outbound window size can be limited unilaterally under the assumption
      * that the opposite end will be using the default (maximum size which can
      * read anything)
      *
-     * Inbound window size must be limited by asking the remote endpoint to 
+     * Inbound window size must be limited by asking the remote endpoint to
      * do so and it agreeing.
-     * 
-     * Context takeover is also primarily controlled by the writer. If the 
+     *
+     * Context takeover is also primarily controlled by the writer. If the
      * compressor does not clear its context between messages then the reader
      * can't either.
      *
@@ -81,17 +81,17 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
      * - whether or not to request that the server disallow context takeover
      *
      * Server must answer in the following ways
-     * - If client requested a window size limit, is the window size limit 
+     * - If client requested a window size limit, is the window size limit
      *   acceptable?
      * - If client allows window limit requests, should we send one?
      * - If client requested no context takeover, should we accept?
-     * 
-     * 
-     * 
+     *
+     *
+     *
      * All Defaults
      * Req: permessage-compress; method=deflate
      * Ans: permessage-compress; method=deflate
-     * 
+     *
      * # Client wants to limit the size of inbound windows from server
      * permessage-compress; method="deflate; s2c_max_window_bits=8, deflate"
      * Ans: permessage-compress; method="deflate; s2c_max_window_bits=8"
@@ -99,13 +99,13 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
      * Ans: permessage-compress; method=deflate
      *
      * # Server wants to limit the size of inbound windows from client
-     * Client: 
+     * Client:
      * permessage-compress; method="deflate; c2s_max_window_bits, deflate"
-     * 
+     *
      * Server:
      * permessage-compress; method="deflate; c2s_max_window_bits=8"
-     * 
-     * # Client wants to 
+     *
+     * # Client wants to
      *
      *
      *
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
      *
      *
      */
-    
+
 
 
 
@@ -144,30 +144,30 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
     attributes.push_back(http::parser::attribute("s2c_max_window_bits","9"));
     ec = d.init(attributes);
     BOOST_CHECK( !ec);
-    
+
     attributes.clear();
     ec = d.init(attributes);
     BOOST_CHECK( !ec);
-    
+
     processor::extensions::deflate_engine de;
-    
+
     unsigned char test_in[] = "HelloHelloHelloHello";
     unsigned char test_out[30];
-    
+
     uLongf test_out_size = 30;
-    
+
     int ret;
 
-    ret = compress(test_out, &test_out_size, test_in, 20); 
-    
+    ret = compress(test_out, &test_out_size, test_in, 20);
+
     std::cout << ret << std::endl
               << websocketpp::utility::to_hex(test_in,20) << std::endl
               << websocketpp::utility::to_hex(test_out,test_out_size) << std::endl;
-        
+
     std::string input = "Hello";
     std::string output = "";
     ec = de.compress(input,output);
-    
+
     BOOST_CHECK( ec == processor::extensions::error::uninitialized );
 
     //std::cout << ec.message() << websocketpp::utility::to_hex(output) << std::endl;
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE( deflate_init ) {
     std::cout << ec.message() << std::endl
               << websocketpp::utility::to_hex(input) << std::endl
               << websocketpp::utility::to_hex(output) << std::endl;
-    
+
     output = "";
 
     ec = de.compress(input,output);
diff --git a/test/processors/hybi00.cpp b/test/processors/hybi00.cpp
index 48b4932481..65b5f55750 100644
--- a/test/processors/hybi00.cpp
+++ b/test/processors/hybi00.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_00_processor
@@ -43,15 +43,15 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
 };
 
 struct processor_setup {
-    processor_setup(bool server) 
+    processor_setup(bool server)
       : msg_manager(new stub_config::con_msg_manager_type())
       , p(false,server,msg_manager) {}
-    
+
     websocketpp::lib::error_code ec;
 	stub_config::con_msg_manager_type::ptr msg_manager;
 	stub_config::request_type req;
@@ -63,44 +63,44 @@ typedef stub_config::message_type::ptr message_ptr;
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     env.ec = env.p.validate_handshake(env.req);
     BOOST_CHECK(!env.ec);
-    
+
     websocketpp::uri_ptr u;
 
     BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
-    
+
     BOOST_CHECK_EQUAL(u->get_secure(), false);
     BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
     BOOST_CHECK_EQUAL(u->get_resource(), "/");
     BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-    
+
     env.p.process_handshake(env.req,"",env.res);
-    
+
     BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "Upgrade");
     BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "WebSocket");
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Origin"), "http://example.com");
-        
+
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Location"), "ws://www.example.com/");
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Key3"), "n`9eBk9z$R8pOtVb");
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_method );
@@ -108,12 +108,12 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
@@ -121,12 +121,12 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -134,12 +134,12 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -148,12 +148,12 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 BOOST_AUTO_TEST_CASE( bad_host ) {
 	processor_setup env(true);
     websocketpp::uri_ptr u;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
     env.req.replace_header("Sec-WebSocket-Key3","janelle!");
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK( !env.p.validate_handshake(env.req) );
@@ -163,42 +163,42 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols ) {
 	processor_setup env(true);
-    
+
     std::vector<std::string> subps;
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_CHECK_EQUAL( subps.size(), 0 );
 }
 
 BOOST_AUTO_TEST_CASE( prepare_data_frame_null ) {
     processor_setup env(true);
-    
+
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
     message_ptr invalid;
 
 
-    // empty pointers arguements should return sane error 
+    // empty pointers arguements should return sane error
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
 
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
 
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,out), websocketpp::processor::error::invalid_arguments );
-    
+
     // test valid opcodes
     // text (1) should be the only valid opcode
     for (int i = 0; i < 0xF; i++) {
         in->set_opcode(websocketpp::frame::opcode::value(i));
-        
+
         env.ec = env.p.prepare_data_frame(in,out);
-        
+
         if (i != 1) {
             BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
         } else {
             BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
         }
     }
-    
+
     /*
      * TODO: tests for invalid UTF8
     char buf[2] = {0x00, 0x00};
@@ -213,15 +213,15 @@ BOOST_AUTO_TEST_CASE( prepare_data_frame_null ) {
 
 BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
     processor_setup env(true);
-    
+
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
-    
+
     in->set_opcode(websocketpp::frame::opcode::text);
     in->set_payload("foo");
 
     env.ec = env.p.prepare_data_frame(in,out);
-    
+
     unsigned char raw_header[1] = {0x00};
     unsigned char raw_payload[4] = {0x66,0x6f,0x6f,0xff};
 
diff --git a/test/processors/hybi07.cpp b/test/processors/hybi07.cpp
index b12675eafd..2cddc8a52a 100644
--- a/test/processors/hybi07.cpp
+++ b/test/processors/hybi07.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_07_processor
@@ -45,16 +45,16 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
-    
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     /// Extension related config
     static const bool enable_extensions = false;
-    
+
     /// Extension specific config
-    
+
     /// permessage_compress_config
     struct permessage_deflate_config {
         typedef stub_config::request_type request_type;
@@ -71,28 +71,28 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK(!ec);
-    
+
     websocketpp::uri_ptr u;
-    
+
     u = p.get_uri(r);
-    
+
     BOOST_CHECK(u->get_valid());
     BOOST_CHECK(!u->get_secure());
     BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
     BOOST_CHECK_EQUAL(u->get_resource(), "/");
     BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-    
+
     p.process_handshake(r,"",response);
-    
+
     BOOST_CHECK_EQUAL(response.get_header("Connection"), "upgrade");
     BOOST_CHECK_EQUAL(response.get_header("Upgrade"), "websocket");
     BOOST_CHECK_EQUAL(response.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
@@ -107,9 +107,9 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
     websocketpp::lib::error_code ec;
 
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -123,11 +123,11 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -141,11 +141,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -159,11 +159,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -177,15 +177,15 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK( !ec );
-    
+
     BOOST_CHECK( !p.get_uri(r)->get_valid() );
 }
diff --git a/test/processors/hybi08.cpp b/test/processors/hybi08.cpp
index c71f882dab..60da59e797 100644
--- a/test/processors/hybi08.cpp
+++ b/test/processors/hybi08.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_08_processor
@@ -45,16 +45,16 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
 
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
 
     /// Extension related config
     static const bool enable_extensions = false;
-    
+
     /// Extension specific config
-    
+
     /// permessage_deflate_config
     struct permessage_deflate_config {
         typedef stub_config::request_type request_type;
@@ -71,28 +71,28 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK(!ec);
-    
+
     websocketpp::uri_ptr u;
-    
+
     u = p.get_uri(r);
-    
+
     BOOST_CHECK(u->get_valid() == true);
     BOOST_CHECK(u->get_secure() == false);
     BOOST_CHECK(u->get_host() == "www.example.com");
     BOOST_CHECK(u->get_resource() == "/");
     BOOST_CHECK(u->get_port() == websocketpp::uri_default_port);
-    
+
     p.process_handshake(r,"",response);
-    
+
     BOOST_CHECK(response.get_header("Connection") == "upgrade");
     BOOST_CHECK(response.get_header("Upgrade") == "websocket");
     BOOST_CHECK(response.get_header("Sec-WebSocket-Accept") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
@@ -107,9 +107,9 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
     websocketpp::lib::error_code ec;
 
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -123,11 +123,11 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -141,11 +141,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -159,11 +159,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 	stub_config::rng_type rng;
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
@@ -178,18 +178,18 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
     websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
     websocketpp::uri_ptr u;
     websocketpp::lib::error_code ec;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
     ec = p.validate_handshake(r);
     BOOST_CHECK( !ec );
-    
+
     u = p.get_uri(r);
-    
+
     BOOST_CHECK( !u->get_valid() );
 }
 
diff --git a/test/processors/hybi13.cpp b/test/processors/hybi13.cpp
index bf19ad0152..0cacb567a7 100644
--- a/test/processors/hybi13.cpp
+++ b/test/processors/hybi13.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_13_processor
@@ -37,7 +37,7 @@
 #include <websocketpp/http/response.hpp>
 #include <websocketpp/message_buffer/message.hpp>
 #include <websocketpp/message_buffer/alloc.hpp>
-#include <websocketpp/random/none.hpp> 
+#include <websocketpp/random/none.hpp>
 
 #include <websocketpp/extensions/permessage_deflate/disabled.hpp>
 #include <websocketpp/extensions/permessage_deflate/enabled.hpp>
@@ -48,11 +48,11 @@ struct stub_config {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
-    
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     struct permessage_deflate_config {
         typedef stub_config::request_type request_type;
     };
@@ -69,15 +69,15 @@ struct stub_config_ext {
 
 	typedef websocketpp::message_buffer::message
 		<websocketpp::message_buffer::alloc::con_msg_manager> message_type;
-	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type> 
+	typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
 		con_msg_manager_type;
-    
+
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     struct permessage_deflate_config {
         typedef stub_config_ext::request_type request_type;
     };
-    
+
     typedef websocketpp::extensions::permessage_deflate::enabled
         <permessage_deflate_config> permessage_deflate_type;
 
@@ -90,10 +90,10 @@ typedef stub_config::message_type::ptr message_ptr;
 // Set up a structure that constructs new copies of all of the support structure
 // for using connection processors
 struct processor_setup {
-    processor_setup(bool server) 
+    processor_setup(bool server)
       : msg_manager(new con_msg_manager_type())
       , p(false,server,msg_manager,rng) {}
-    
+
     websocketpp::lib::error_code ec;
 	con_msg_manager_type::ptr msg_manager;
 	stub_config::rng_type rng;
@@ -103,10 +103,10 @@ struct processor_setup {
 };
 
 struct processor_setup_ext {
-    processor_setup_ext(bool server) 
+    processor_setup_ext(bool server)
       : msg_manager(new con_msg_manager_type())
       , p(false,server,msg_manager,rng) {}
-    
+
     websocketpp::lib::error_code ec;
 	con_msg_manager_type::ptr msg_manager;
 	stub_config::rng_type rng;
@@ -117,26 +117,26 @@ struct processor_setup_ext {
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK(!env.p.validate_handshake(env.req));
-    
+
     websocketpp::uri_ptr u;
-    
+
     BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
-    
+
     BOOST_CHECK_EQUAL(u->get_secure(), false);
     BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
     BOOST_CHECK_EQUAL(u->get_resource(), "/");
     BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
-    
+
     env.p.process_handshake(env.req,"",env.res);
-    
+
     BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "upgrade");
     BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "websocket");
     BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
@@ -146,9 +146,9 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 	processor_setup env(true);
 
     std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK( env.p.validate_handshake(env.req) == websocketpp::processor::error::invalid_http_method );
@@ -156,11 +156,11 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
     BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
@@ -168,11 +168,11 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
     BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -180,11 +180,11 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
     processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
     BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
     BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
@@ -192,14 +192,14 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 
 BOOST_AUTO_TEST_CASE( bad_host ) {
 	processor_setup env(true);
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
-    
+
     env.req.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
     BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
-    BOOST_CHECK( !env.p.validate_handshake(env.req) );    
+    BOOST_CHECK( !env.p.validate_handshake(env.req) );
     BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
 }
 
@@ -224,11 +224,11 @@ BOOST_AUTO_TEST_CASE( frame_empty_binary_unmasked ) {
 	processor_setup env1(false);
 
 	size_t ret1 = env1.p.consume(frame,2,env1.ec);
-	
+
 	BOOST_CHECK_EQUAL( ret1, 2 );
 	BOOST_CHECK( !env1.ec );
-	BOOST_CHECK_EQUAL( env1.p.ready(), true );	
-	
+	BOOST_CHECK_EQUAL( env1.p.ready(), true );
+
 	// two separate chunks
 	processor_setup env2(false);
 
@@ -245,12 +245,12 @@ BOOST_AUTO_TEST_CASE( frame_small_binary_unmasked ) {
 	processor_setup env(false);
 
 	uint8_t frame[4] = {0x82, 0x02, 0x2A, 0x2A};
-	
+
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 	BOOST_CHECK_EQUAL( env.p.consume(frame,4,env.ec), 4 );
 	BOOST_CHECK( !env.ec );
 	BOOST_CHECK_EQUAL( env.p.ready(), true );
-	
+
 	message_ptr foo = env.p.get_message();
 
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
@@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE( frame_extended_binary_unmasked ) {
 	BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
 	BOOST_CHECK( !env.ec );
 	BOOST_CHECK_EQUAL( env.p.ready(), true );
-	
+
 	message_ptr foo = env.p.get_message();
 
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
@@ -289,7 +289,7 @@ BOOST_AUTO_TEST_CASE( frame_jumbo_binary_unmasked ) {
 	BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
 	BOOST_CHECK( !env.ec );
 	BOOST_CHECK_EQUAL( env.p.ready(), true );
-	
+
 	message_ptr foo = env.p.get_message();
 
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
@@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE( rsv_bits_used ) {
 
 	for (int i = 0; i < 3; i++) {
 		processor_setup env(false);
-	
+
 		BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 		BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
 	    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_rsv_bit  );
@@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE( reserved_opcode_used ) {
 
 	for (int i = 0; i < 10; i++) {
 		processor_setup env(false);
-	
+
 		BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 		BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
 	    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode  );
@@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE( fragmented_binary_message ) {
     BOOST_CHECK( !env0.ec );
 	BOOST_CHECK_EQUAL( env0.p.ready(), true );
 	BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
-	
+
 	// read fragmented message in two chunks
 	BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
 	BOOST_CHECK_EQUAL( env0.p.consume(frame0,3,env0.ec), 3 );
@@ -442,25 +442,25 @@ BOOST_AUTO_TEST_CASE( frame_small_binary_masked ) {
 BOOST_AUTO_TEST_CASE( masked_fragmented_binary_message ) {
     processor_setup env(true);
 
-	uint8_t frame0[14] = {0x02, 0x81, 0xAB, 0x23, 0x98, 0x45, 0x81, 
+	uint8_t frame0[14] = {0x02, 0x81, 0xAB, 0x23, 0x98, 0x45, 0x81,
 	                     0x80, 0x81, 0xB8, 0x34, 0x12, 0xFF, 0x92};
 
 	// read fragmented message in one chunk
 	BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
 	BOOST_CHECK_EQUAL( env.p.consume(frame0,14,env.ec), 14 );
     BOOST_CHECK( !env.ec );
-	BOOST_CHECK_EQUAL( env.p.ready(), true );	
+	BOOST_CHECK_EQUAL( env.p.ready(), true );
 	BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "**" );
 }
 
 BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
 	processor_setup env(true);
-    
+
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
     message_ptr invalid;
 
-    // empty pointers arguements should return sane error 
+    // empty pointers arguements should return sane error
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
 
     BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
@@ -471,19 +471,19 @@ BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
     // control opcodes should return an error, data ones shouldn't
     for (int i = 0; i < 0xF; i++) {
         in->set_opcode(websocketpp::frame::opcode::value(i));
-        
+
         env.ec = env.p.prepare_data_frame(in,out);
-        
+
         if (websocketpp::frame::opcode::is_control(in->get_opcode())) {
             BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
         } else {
             BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
         }
     }
-    
-    
+
+
     //in.set_payload("foo");
-    
+
     //e = prepare_data_frame(in,out);
 
 
@@ -492,22 +492,22 @@ BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
 
 BOOST_AUTO_TEST_CASE( client_handshake_request ) {
     processor_setup env(false);
-    
+
     websocketpp::uri_ptr u(new websocketpp::uri("ws://localhost/"));
-    
+
     env.p.client_handshake_request(env.req,u, std::vector<std::string>());
-    
+
     BOOST_CHECK_EQUAL( env.req.get_method(), "GET" );
     BOOST_CHECK_EQUAL( env.req.get_version(), "HTTP/1.1");
     BOOST_CHECK_EQUAL( env.req.get_uri(), "/");
-    
+
     BOOST_CHECK_EQUAL( env.req.get_header("Host"), "localhost");
     BOOST_CHECK_EQUAL( env.req.get_header("Sec-WebSocket-Version"), "13");
     BOOST_CHECK_EQUAL( env.req.get_header("Connection"), "Upgrade");
     BOOST_CHECK_EQUAL( env.req.get_header("Upgrade"), "websocket");
 }
 
-// TODO: 
+// TODO:
 // test cases
 // - adding headers
 // - adding Upgrade header
@@ -524,48 +524,48 @@ BOOST_AUTO_TEST_CASE( client_handshake_request ) {
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_404 ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 404 Not Found\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::invalid_http_status );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_no_upgrade ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_no_connection ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response_no_accept ) {
     processor_setup env(false);
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
 }
 
 BOOST_AUTO_TEST_CASE( client_handshake_response ) {
     processor_setup env(false);
-    
+
     env.req.append_header("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==");
-    
+
     std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n\r\n";
     env.res.consume(res.data(),res.size());
-    
+
     BOOST_CHECK( !env.p.validate_server_handshake_response(env.req,env.res) );
 }
 
@@ -576,7 +576,7 @@ BOOST_AUTO_TEST_CASE( extensions_disabled ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK_EQUAL( neg_results.first, websocketpp::processor::error::extensions_disabled );
     BOOST_CHECK_EQUAL( neg_results.second, "" );
 }
@@ -588,7 +588,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_blank ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK( !neg_results.first );
     BOOST_CHECK_EQUAL( neg_results.second, "" );
 }
@@ -600,7 +600,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK( !neg_results.first );
     BOOST_CHECK_EQUAL( neg_results.second, "" );
 }
@@ -608,7 +608,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_CHECK_EQUAL( subps.size(), 0 );
 }
@@ -616,9 +616,9 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     env.req.replace_header("Sec-WebSocket-Protocol","foo");
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_REQUIRE_EQUAL( subps.size(), 1 );
     BOOST_CHECK_EQUAL( subps[0], "foo" );
@@ -627,9 +627,9 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     env.req.replace_header("Sec-WebSocket-Protocol","foo,bar");
-    
+
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
     BOOST_REQUIRE_EQUAL( subps.size(), 2 );
     BOOST_CHECK_EQUAL( subps[0], "foo" );
@@ -639,9 +639,9 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
 BOOST_AUTO_TEST_CASE( extract_subprotocols_invalid) {
 	processor_setup env(true);
     std::vector<std::string> subps;
-    
+
     env.req.replace_header("Sec-WebSocket-Protocol","foo,bar,,,,");
-    
+
     BOOST_CHECK_EQUAL( env.p.extract_subprotocols(env.req,subps), websocketpp::processor::error::make_error_code(websocketpp::processor::error::subprotocol_parse_error) );
     BOOST_CHECK_EQUAL( subps.size(), 0 );
 }
@@ -654,7 +654,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_permessage_deflate ) {
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);
-    
+
     BOOST_CHECK( !neg_results.first );
     BOOST_CHECK_EQUAL( neg_results.second, "permessage-deflate" );
 }
diff --git a/test/processors/processor.cpp b/test/processors/processor.cpp
index 0e68f7c8a5..aa3c038b2c 100644
--- a/test/processors/processor.cpp
+++ b/test/processors/processor.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE processors
@@ -36,100 +36,100 @@
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( non_match ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(!websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( ci_exact_match ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: UpGrAde\r\nUpgrade: WebSocket\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( non_exact_match1 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade,foo\r\nUpgrade: websocket,foo\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( non_exact_match2 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: keep-alive,Upgrade,foo\r\nUpgrade: foo,websocket,bar\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
 }
 
 BOOST_AUTO_TEST_CASE( version_blank ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 0);
 }
 
 BOOST_AUTO_TEST_CASE( version_7 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 7);
 }
 
 BOOST_AUTO_TEST_CASE( version_8 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 8);
 }
 
 BOOST_AUTO_TEST_CASE( version_13 ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 13);
 }
 
 BOOST_AUTO_TEST_CASE( version_non_numeric ) {
     websocketpp::http::parser::request r;
-    
+
     std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: abc\r\n\r\n";
-    
+
     r.consume(handshake.c_str(),handshake.size());
-    
+
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == -1);
-}
\ No newline at end of file
+}
diff --git a/test/random/none.cpp b/test/random/none.cpp
index 83a56f7bc1..8102733445 100644
--- a/test/random/none.cpp
+++ b/test/random/none.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE random_none
@@ -33,8 +33,8 @@
 
 BOOST_AUTO_TEST_CASE( does_it_compile ) {
     websocketpp::random::none::int_generator<int32_t> rng;
-    
+
     int32_t foo = rng();
-    
+
     BOOST_CHECK( foo == 0 );
-}
\ No newline at end of file
+}
diff --git a/test/random/random_device.cpp b/test/random/random_device.cpp
index 7aaeb2c377..4f6690d87e 100644
--- a/test/random/random_device.cpp
+++ b/test/random/random_device.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE random_device
@@ -36,15 +36,15 @@
 
 BOOST_AUTO_TEST_CASE( compiles ) {
     websocketpp::random::random_device::int_generator<int32_t,websocketpp::concurrency::none> rng;
-    
+
     bool e = false;
-    
+
     try {
         int32_t foo = rng();
         std::cout << foo << std::endl;
     } catch (...) {
         e = true;
     }
-    
+
     BOOST_CHECK( e == false );
 }
diff --git a/test/roles/client.cpp b/test/roles/client.cpp
index d6509384db..6948dc0b43 100644
--- a/test/roles/client.cpp
+++ b/test/roles/client.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE client
@@ -52,11 +52,11 @@ struct stub_config : public websocketpp::config::core {
 
     //typedef core::rng_type rng_type;
     typedef websocketpp::random::random_device::int_generator<uint32_t,concurrency_type> rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef core::endpoint_base endpoint_base;
-    
+
     static const websocketpp::log::level elog_level = websocketpp::log::elevel::none;
     static const websocketpp::log::level alog_level = websocketpp::log::alevel::none;
 };
@@ -67,27 +67,27 @@ typedef client::connection_ptr connection_ptr;
 BOOST_AUTO_TEST_CASE( invalid_uri ) {
     client c;
     websocketpp::lib::error_code ec;
-    
+
     connection_ptr con = c.get_connection("foo", ec);
-    
+
     BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::invalid_uri) );
 }
 
 BOOST_AUTO_TEST_CASE( unsecure_endpoint ) {
     client c;
     websocketpp::lib::error_code ec;
-    
+
     connection_ptr con = c.get_connection("wss://localhost/", ec);
-    
+
     BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::endpoint_not_secure) );
 }
 
 BOOST_AUTO_TEST_CASE( get_connection ) {
     client c;
     websocketpp::lib::error_code ec;
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
-    
+
     BOOST_CHECK( con );
     BOOST_CHECK_EQUAL( con->get_host() , "localhost" );
     BOOST_CHECK_EQUAL( con->get_port() , 80 );
@@ -100,34 +100,34 @@ BOOST_AUTO_TEST_CASE( connect_con ) {
     websocketpp::lib::error_code ec;
     std::stringstream out;
     std::string o;
-    
+
     c.register_ostream(&out);
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     c.connect(con);
-    
+
     o = out.str();
     websocketpp::http::parser::request r;
     r.consume(o.data(),o.size());
-    
+
     BOOST_CHECK( r.ready() );
     BOOST_CHECK_EQUAL( r.get_method(), "GET");
     BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1");
     BOOST_CHECK_EQUAL( r.get_uri(), "/");
-    
+
     BOOST_CHECK_EQUAL( r.get_header("Host"), "localhost");
     BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Version"), "13");
     BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade");
     BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket");
-    
+
     // Key is randomly generated & User-Agent will change so just check that
     // they are not empty.
     BOOST_CHECK_NE( r.get_header("Sec-WebSocket-Key"), "");
     BOOST_CHECK_NE( r.get_header("User-Agent"), "" );
-    
+
     // connection should have written out an opening handshake request and be in
     // the read response internal state
-        
+
     // TODO: more tests related to reading the HTTP response
     std::stringstream channel2;
 	channel2 << "e\r\n\r\n";
@@ -138,11 +138,11 @@ BOOST_AUTO_TEST_CASE( select_subprotocol ) {
     client c;
     websocketpp::lib::error_code ec;
     using websocketpp::error::make_error_code;
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
-    
+
     BOOST_CHECK( con );
-    
+
     con->select_subprotocol("foo",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::server_only) );
     BOOST_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::lib::error_code );
@@ -152,14 +152,14 @@ BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
     client c;
     websocketpp::lib::error_code ec;
     using websocketpp::error::make_error_code;
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     BOOST_CHECK( con );
-    
+
     con->add_subprotocol("",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
     BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::lib::error_code );
-    
+
     con->add_subprotocol("foo,bar",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
     BOOST_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::lib::error_code );
@@ -170,23 +170,23 @@ BOOST_AUTO_TEST_CASE( add_subprotocols ) {
     websocketpp::lib::error_code ec;
     std::stringstream out;
     std::string o;
-    
+
     c.register_ostream(&out);
-    
+
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     BOOST_CHECK( con );
-    
+
     con->add_subprotocol("foo",ec);
     BOOST_CHECK( !ec );
-    
+
     BOOST_CHECK_NO_THROW( con->add_subprotocol("bar") );
-    
+
     c.connect(con);
-    
+
     o = out.str();
     websocketpp::http::parser::request r;
     r.consume(o.data(),o.size());
-        
+
     BOOST_CHECK( r.ready() );
     BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "foo, bar");
 }
diff --git a/test/roles/server.cpp b/test/roles/server.cpp
index edb3f6ed34..ada03f1aed 100644
--- a/test/roles/server.cpp
+++ b/test/roles/server.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE server
@@ -56,9 +56,9 @@ using websocketpp::lib::bind;
     typedef core::elog_type elog_type;
 
     typedef core::rng_type rng_type;
-    
+
     typedef core::transport_type transport_type;
-    
+
     typedef core::endpoint_base endpoint_base;
 };*/
 
@@ -66,19 +66,19 @@ using websocketpp::lib::bind;
 std::string run_server_test(server& s, std::string input) {
     server::connection_ptr con;
     std::stringstream output;
-	
+
 	s.register_ostream(&output);
 	s.clear_access_channels(websocketpp::log::alevel::all);
     s.clear_error_channels(websocketpp::log::elevel::all);
-	
+
 	con = s.get_connection();
 	con->start();
-	
+
 	std::stringstream channel;
-	
+
 	channel << input;
 	channel >> *con;
-	
+
 	return output.str();
 }
 
@@ -91,28 +91,28 @@ bool validate_func_subprotocol(server* s, std::string* out, std::string accept,
     websocketpp::connection_hdl hdl)
 {
     server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
+
     std::stringstream o;
-    
+
     const std::vector<std::string> & protocols = con->get_requested_subprotocols();
     std::vector<std::string>::const_iterator it;
-    
+
     for (it = protocols.begin(); it != protocols.end(); ++it) {
         o << *it << ",";
     }
 
     *out = o.str();
-    
+
     if (accept != "") {
         con->select_subprotocol(accept);
     }
-        
+
     return true;
 }
 
 void open_func_subprotocol(server* s, std::string* out, websocketpp::connection_hdl hdl) {
     server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
+
     *out = con->get_subprotocol();
 }
 
@@ -120,21 +120,21 @@ void open_func_subprotocol(server* s, std::string* out, websocketpp::connection_
 BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	server s;
 	s.set_user_agent("test");
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
 BOOST_AUTO_TEST_CASE( invalid_websocket_version ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: a\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 400 Bad Request\r\nServer: test\r\n\r\n";
-	    
+
     server s;
     s.set_user_agent("test");
 	//s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
@@ -142,10 +142,10 @@ BOOST_AUTO_TEST_CASE( unimplemented_websocket_version ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 14\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
 
     std::string output = "HTTP/1.1 400 Bad Request\r\nSec-WebSocket-Version: 0,7,8,13\r\nServer: test\r\n\r\n";
-	
+
 	server s;
     s.set_user_agent("test");
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
 
@@ -153,13 +153,13 @@ BOOST_AUTO_TEST_CASE( list_subprotocol_empty ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string subprotocol;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&subprotocol,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(subprotocol, "");
 }
@@ -168,15 +168,15 @@ BOOST_AUTO_TEST_CASE( list_subprotocol_one ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(validate, "foo,");
     BOOST_CHECK_EQUAL(open, "");
@@ -186,15 +186,15 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_one ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(validate, "foo,");
     BOOST_CHECK_EQUAL(open, "foo");
@@ -204,17 +204,17 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_invalid ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo2",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
 	std::string o;
-	
+
 	BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::lib::error_code);
 }
 
@@ -222,15 +222,15 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo, bar\r\n\r\n";
 
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: bar\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
-	
+
 	std::string validate;
 	std::string open;
-	
+
 	server s;
     s.set_user_agent("test");
 	s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"bar",::_1));
 	s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
-	
+
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(validate, "foo,bar,");
     BOOST_CHECK_EQUAL(open, "bar");
@@ -239,9 +239,9 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
 /*BOOST_AUTO_TEST_CASE( user_reject_origin ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
     std::string output = "HTTP/1.1 403 Forbidden\r\nServer: test\r\n\r\n";
-	    
+
     server s;
     s.set_user_agent("test");
-	
+
     BOOST_CHECK(run_server_test(s,input) == output);
 }*/
diff --git a/test/transport/asio/base.cpp b/test/transport/asio/base.cpp
index 44a13019de..8d2914dd29 100644
--- a/test/transport/asio/base.cpp
+++ b/test/transport/asio/base.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_asio_base
@@ -34,16 +34,16 @@
 
 BOOST_AUTO_TEST_CASE( blank_error ) {
     websocketpp::lib::error_code ec;
-        
+
     BOOST_CHECK( !ec );
 }
 
 BOOST_AUTO_TEST_CASE( asio_error ) {
     using websocketpp::transport::asio::error::make_error_code;
     using websocketpp::transport::asio::error::general;
-    
+
     websocketpp::lib::error_code ec = make_error_code(general);
-        
+
     BOOST_CHECK( ec == general );
     BOOST_CHECK( ec.value() == 1 );
-}
\ No newline at end of file
+}
diff --git a/test/transport/asio/timers.cpp b/test/transport/asio/timers.cpp
index e5f13095ea..f37d2e9874 100644
--- a/test/transport/asio/timers.cpp
+++ b/test/transport/asio/timers.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_asio_timers
@@ -52,12 +52,12 @@
 // Accept a connection, read data, and discard until EOF
 void run_dummy_server(int port) {
     using boost::asio::ip::tcp;
-    
-    try {    
+
+    try {
         boost::asio::io_service io_service;
         tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
         tcp::socket socket(io_service);
-    
+
         acceptor.accept(socket);
         for (;;) {
             char data[512];
@@ -94,7 +94,7 @@ struct config {
     typedef websocketpp::http::parser::request request_type;
     typedef websocketpp::http::parser::response response_type;
     typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-    
+
     static const long timeout_socket_pre_init = 1000;
     static const long timeout_proxy = 1000;
     static const long timeout_socket_post_init = 1000;
@@ -112,20 +112,20 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
 // Mock connection
 struct mock_con: public websocketpp::transport::asio::connection<config> {
     typedef websocketpp::transport::asio::connection<config> base;
-    
+
     mock_con(bool a, config::alog_type& b, config::elog_type& c) : base(a,b,c) {}
-    
+
     void start() {
         base::init(websocketpp::lib::bind(&mock_con::handle_start,this,
             websocketpp::lib::placeholders::_1));
     }
-    
+
     void handle_start(const websocketpp::lib::error_code& ec) {
         using websocketpp::transport::asio::socket::make_error_code;
         using websocketpp::transport::asio::socket::error::tls_handshake_timeout;
-        
+
         BOOST_CHECK_EQUAL( ec, make_error_code(tls_handshake_timeout) );
-        
+
         base::cancel_socket();
     }
 };
@@ -135,20 +135,20 @@ typedef websocketpp::lib::shared_ptr<mock_con> connection_ptr;
 
 struct mock_endpoint : public websocketpp::transport::asio::endpoint<config> {
     typedef websocketpp::transport::asio::endpoint<config> base;
-    
+
     mock_endpoint() {
         alog.set_channels(websocketpp::log::alevel::all);
         base::init_logging(&alog,&elog);
         init_asio();
     }
-    
+
     void connect(std::string u) {
         m_con.reset(new mock_con(false,alog,elog));
         websocketpp::uri_ptr uri(new websocketpp::uri(u));
-        
+
         BOOST_CHECK( uri->get_valid() );
         BOOST_CHECK_EQUAL( base::init(m_con), websocketpp::lib::error_code() );
-        
+
         base::async_connect(
             m_con,
             uri,
@@ -161,14 +161,14 @@ struct mock_endpoint : public websocketpp::transport::asio::endpoint<config> {
             )
         );
     }
-    
-    void handle_connect(connection_ptr con, websocketpp::connection_hdl, 
+
+    void handle_connect(connection_ptr con, websocketpp::connection_hdl,
         const websocketpp::lib::error_code & ec)
     {
         BOOST_CHECK( !ec );
         con->start();
     }
-    
+
     connection_ptr m_con;
     config::alog_type alog;
     config::elog_type elog;
@@ -179,7 +179,7 @@ BOOST_AUTO_TEST_CASE( tls_handshake_timeout ) {
     websocketpp::lib::thread timer(websocketpp::lib::bind(&run_test_timer,5000));
     dummy_server.detach();
     timer.detach();
-    
+
     mock_endpoint endpoint;
     endpoint.set_tls_init_handler(&on_tls_init);
     endpoint.connect("wss://localhost:9005");
diff --git a/test/transport/hybi_util.cpp b/test/transport/hybi_util.cpp
index 2e89320744..309bf377e3 100644
--- a/test/transport/hybi_util.cpp
+++ b/test/transport/hybi_util.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE hybi_util
@@ -36,15 +36,15 @@
 BOOST_AUTO_TEST_CASE( circshift_0 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
-        
+
         BOOST_CHECK( test == 0x0123456789abcdef);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
-        
+
         BOOST_CHECK( test == 0x01234567);
     }
 }
@@ -52,15 +52,15 @@ BOOST_AUTO_TEST_CASE( circshift_0 ) {
 BOOST_AUTO_TEST_CASE( circshift_1 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
-        
+
         BOOST_CHECK( test == 0xef0123456789abcd);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
-        
+
         BOOST_CHECK( test == 0x67012345);
     }
 }
@@ -68,15 +68,15 @@ BOOST_AUTO_TEST_CASE( circshift_1 ) {
 BOOST_AUTO_TEST_CASE( circshift_2 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
-        
+
         BOOST_CHECK( test == 0xcdef0123456789ab);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
-        
+
         BOOST_CHECK( test == 0x45670123);
     }
 }
@@ -84,15 +84,15 @@ BOOST_AUTO_TEST_CASE( circshift_2 ) {
 BOOST_AUTO_TEST_CASE( circshift_3 ) {
     if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
-        
+
         BOOST_CHECK( test == 0xabcdef0123456789);
     } else {
         size_t test = 0x01234567;
-        
+
         test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
-        
+
         BOOST_CHECK( test == 0x23456701);
     }
 }
diff --git a/test/transport/integration.cpp b/test/transport/integration.cpp
index 3bbc58f952..5afb558726 100644
--- a/test/transport/integration.cpp
+++ b/test/transport/integration.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_integration
@@ -38,37 +38,37 @@
 struct config : public websocketpp::config::asio_client {
     typedef config type;
     typedef websocketpp::config::asio base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
-    
+
     struct transport_config : public base::transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::alog_type alog_type;
         typedef type::elog_type elog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
+        typedef websocketpp::transport::asio::basic_socket::endpoint
             socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
-    
+
     //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
     //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
-    
+
     /// Length of time before an opening handshake is aborted
     static const long timeout_open_handshake = 500;
     /// Length of time before a closing handshake is aborted
@@ -115,7 +115,7 @@ void run_client(client & c, std::string uri, bool log = false) {
         c.clear_error_channels(websocketpp::log::elevel::all);
     }
     c.init_asio();
-    
+
     websocketpp::lib::error_code ec;
     client::connection_ptr con = c.get_connection(uri,ec);
     BOOST_CHECK( !ec );
@@ -124,7 +124,7 @@ void run_client(client & c, std::string uri, bool log = false) {
     c.run();
 }
 
-void run_time_limited_client(client & c, std::string uri, long timeout, 
+void run_time_limited_client(client & c, std::string uri, long timeout,
     bool log)
 {
     if (log) {
@@ -135,12 +135,12 @@ void run_time_limited_client(client & c, std::string uri, long timeout,
         c.clear_error_channels(websocketpp::log::elevel::all);
     }
     c.init_asio();
-    
+
     websocketpp::lib::error_code ec;
     client::connection_ptr con = c.get_connection(uri,ec);
     BOOST_CHECK( !ec );
     c.connect(con);
-    
+
     websocketpp::lib::thread tthread(websocketpp::lib::bind(
         &close_after_timeout<client>,
         websocketpp::lib::ref(c),
@@ -148,18 +148,18 @@ void run_time_limited_client(client & c, std::string uri, long timeout,
         timeout
     ));
     tthread.detach();
-    
+
     c.run();
 }
 
 void run_dummy_server(int port) {
     using boost::asio::ip::tcp;
-    
-    try {    
+
+    try {
         boost::asio::io_service io_service;
         tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
         tcp::socket socket(io_service);
-    
+
         acceptor.accept(socket);
         for (;;) {
             char data[512];
@@ -181,14 +181,14 @@ void run_dummy_server(int port) {
 
 void run_dummy_client(std::string port) {
     using boost::asio::ip::tcp;
-    
-    try {    
+
+    try {
         boost::asio::io_service io_service;
         tcp::resolver resolver(io_service);
         tcp::resolver::query query("localhost", port);
         tcp::resolver::iterator iterator = resolver.resolve(query);
         tcp::socket socket(io_service);
-    
+
         boost::asio::connect(socket, iterator);
         for (;;) {
             char data[512];
@@ -237,7 +237,7 @@ void fail_on_pong_timeout(websocketpp::connection_hdl hdl, std::string payload)
     BOOST_FAIL( "expected no pong timeout" );
 }
 
-void req_pong(std::string expected_payload, websocketpp::connection_hdl hdl, 
+void req_pong(std::string expected_payload, websocketpp::connection_hdl hdl,
     std::string payload)
 {
     BOOST_CHECK_EQUAL( expected_payload, payload );
@@ -252,7 +252,7 @@ void delay(websocketpp::connection_hdl hdl, long duration) {
 }
 
 template <typename T>
-void check_ec(T * c, websocketpp::lib::error_code ec, 
+void check_ec(T * c, websocketpp::lib::error_code ec,
     websocketpp::connection_hdl hdl)
 {
     typename T::connection_ptr con = c->get_con_from_hdl(hdl);
@@ -262,7 +262,7 @@ void check_ec(T * c, websocketpp::lib::error_code ec,
 }
 
 template <typename T>
-void check_ec_and_stop(T * e, websocketpp::lib::error_code ec, 
+void check_ec_and_stop(T * e, websocketpp::lib::error_code ec,
     websocketpp::connection_hdl hdl)
 {
     typename T::connection_ptr con = e->get_con_from_hdl(hdl);
@@ -273,7 +273,7 @@ void check_ec_and_stop(T * e, websocketpp::lib::error_code ec,
 }
 
 template <typename T>
-void req_pong_timeout(T * c, std::string expected_payload, 
+void req_pong_timeout(T * c, std::string expected_payload,
     websocketpp::connection_hdl hdl, std::string payload)
 {
     typename T::connection_ptr con = c->get_con_from_hdl(hdl);
@@ -297,19 +297,19 @@ BOOST_AUTO_TEST_CASE( pong_no_timeout ) {
     client c;
 
     s.set_close_handler(bind(&stop_on_close,&s,::_1));
-    
+
     // send a ping when the connection is open
     c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
     // require that a pong with matching payload is received
     c.set_pong_handler(bind(&req_pong,"foo",::_1,::_2));
     // require that a pong timeout is NOT received
     c.set_pong_timeout_handler(bind(&fail_on_pong_timeout,::_1,::_2));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
-    
+
     // Run a client that closes the connection after 1 seconds
     run_time_limited_client(c, "http://localhost:9005", 1, false);
-    
+
     sthread.join();
 }
 
@@ -319,28 +319,28 @@ BOOST_AUTO_TEST_CASE( pong_timeout ) {
 
     s.set_ping_handler(on_ping);
     s.set_close_handler(bind(&stop_on_close,&s,::_1));
-    
+
     c.set_fail_handler(bind(&check_ec<client>,&c,
         websocketpp::lib::error_code(),::_1));
-    
+
     c.set_pong_handler(bind(&fail_on_pong,::_1,::_2));
     c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
     c.set_pong_timeout_handler(bind(&req_pong_timeout<client>,&c,"foo",::_1,::_2));
     c.set_close_handler(bind(&check_ec<client>,&c,
         websocketpp::lib::error_code(),::_1));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
-    
+
     run_client(c, "http://localhost:9005",false);
-    
+
     sthread.join();
 }
 
 BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
     client c;
-    
+
     // set open handler to fail test
     c.set_open_handler(bind(&fail_on_open,::_1));
     // set fail hander to test for the right fail error code
@@ -351,13 +351,13 @@ BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     sthread.detach();
     tthread.detach();
-    
+
     run_client(c, "http://localhost:9005");
 }
 
 BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
     server s;
-    
+
     // set open handler to fail test
     s.set_open_handler(bind(&fail_on_open,::_1));
     // set fail hander to test for the right fail error code
@@ -367,9 +367,9 @@ BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
-    
+
     run_dummy_client("9005");
-    
+
     sthread.join();
 }
 
@@ -386,13 +386,13 @@ BOOST_AUTO_TEST_CASE( client_self_initiated_close_handshake_timeout ) {
     c.set_open_handler(bind(&close<client>,&c,::_1));
     c.set_close_handler(bind(&check_ec<client>,&c,
         websocketpp::error::close_handshake_timeout,::_1));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
-    
+
     run_client(c, "http://localhost:9005",false);
-    
+
     sthread.join();
 }
 
@@ -401,7 +401,7 @@ BOOST_AUTO_TEST_CASE( client_peer_initiated_close_handshake_timeout ) {
     // client should ack normally and then wait
     // server leaves TCP connection open
     // client handshake timer should be triggered
-    
+
     // TODO: how to make a mock server that leaves the TCP connection open?
 }
 
@@ -418,7 +418,7 @@ BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) {
         websocketpp::error::close_handshake_timeout,::_1));
 
     c.set_open_handler(bind(&delay,::_1,1));
-    
+
     websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
     websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
diff --git a/test/transport/iostream/base.cpp b/test/transport/iostream/base.cpp
index 07e6a2754b..2bbac6bb07 100644
--- a/test/transport/iostream/base.cpp
+++ b/test/transport/iostream/base.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_iostream_base
@@ -30,4 +30,4 @@
 
 #include <iostream>
 
-BOOST_AUTO_TEST_CASE( placeholder ) {}
\ No newline at end of file
+BOOST_AUTO_TEST_CASE( placeholder ) {}
diff --git a/test/transport/iostream/connection.cpp b/test/transport/iostream/connection.cpp
index 362c46df68..200f3e5bed 100644
--- a/test/transport/iostream/connection.cpp
+++ b/test/transport/iostream/connection.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_iostream_connection
@@ -54,13 +54,13 @@ using websocketpp::transport::iostream::error::make_error_code;
 struct stub_con : public iostream_con {
     typedef iostream_con::timer_ptr timer_ptr;
 
-    stub_con(bool is_server, config::alog_type &a, config::elog_type & e) 
+    stub_con(bool is_server, config::alog_type &a, config::elog_type & e)
         : iostream_con(is_server,a,e)
         // Set the error to a known code that is unused by the library
         // This way we can easily confirm that the handler was run at all.
         , ec(websocketpp::error::make_error_code(websocketpp::error::test))
     {}
-    
+
     void write(std::string msg) {
         iostream_con::async_write(
             msg.data(),
@@ -72,7 +72,7 @@ struct stub_con : public iostream_con {
             )
         );
     }
-    
+
     void write(std::vector<websocketpp::transport::buffer> & bufs) {
         iostream_con::async_write(
             bufs,
@@ -83,7 +83,7 @@ struct stub_con : public iostream_con {
             )
         );
     }
-    
+
     void async_read_at_least(size_t num_bytes, char *buf, size_t len)
 	{
         iostream_con::async_read_at_least(
@@ -97,11 +97,11 @@ struct stub_con : public iostream_con {
             )
         );
     }
-    
+
     void handle_op(const websocketpp::lib::error_code& e) {
         ec = e;
     }
-    
+
     websocketpp::lib::error_code ec;
 };
 
@@ -111,17 +111,17 @@ config::elog_type e;
 
 BOOST_AUTO_TEST_CASE( const_methods ) {
     iostream_con con(true,a,e);
-		
+
     BOOST_CHECK( con.is_secure() == false );
     BOOST_CHECK( con.get_remote_endpoint() == "iostream transport" );
 }
 
 BOOST_AUTO_TEST_CASE( write_before_ostream_set ) {
     stub_con con(true,a,e);
-        
+
     con.write("foo");
     BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
-    
+
     std::vector<websocketpp::transport::buffer> bufs;
     con.write(bufs);
     BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
@@ -129,83 +129,83 @@ BOOST_AUTO_TEST_CASE( write_before_ostream_set ) {
 
 BOOST_AUTO_TEST_CASE( async_write ) {
     stub_con con(true,a,e);
-    
+
     std::stringstream output;
-    
+
     con.register_ostream(&output);
-        
+
     con.write("foo");
-    
+
     BOOST_CHECK( !con.ec );
     BOOST_CHECK( output.str() == "foo" );
 }
 
 BOOST_AUTO_TEST_CASE( async_write_vector_0 ) {
     std::stringstream output;
-    
+
     stub_con con(true,a,e);
     con.register_ostream(&output);
-        
+
     std::vector<websocketpp::transport::buffer> bufs;
-    
+
     con.write(bufs);
-    
+
     BOOST_CHECK( !con.ec );
     BOOST_CHECK( output.str() == "" );
 }
 
 BOOST_AUTO_TEST_CASE( async_write_vector_1 ) {
     std::stringstream output;
-    
+
     stub_con con(true,a,e);
     con.register_ostream(&output);
-        
+
     std::vector<websocketpp::transport::buffer> bufs;
-    
+
     std::string foo = "foo";
-    
+
     bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
-    
+
     con.write(bufs);
-    
+
     BOOST_CHECK( !con.ec );
     BOOST_CHECK( output.str() == "foo" );
 }
 
 BOOST_AUTO_TEST_CASE( async_write_vector_2 ) {
     std::stringstream output;
-    
+
     stub_con con(true,a,e);
     con.register_ostream(&output);
-        
+
     std::vector<websocketpp::transport::buffer> bufs;
-    
+
     std::string foo = "foo";
     std::string bar = "bar";
-    
+
     bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
     bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
-    
+
     con.write(bufs);
-    
+
     BOOST_CHECK( !con.ec );
     BOOST_CHECK( output.str() == "foobar" );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least_too_much ) {
     stub_con con(true,a,e);
-    
+
     char buf[10];
-        
+
     con.async_read_at_least(11,buf,10);
     BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::invalid_num_bytes) );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
     stub_con con(true,a,e);
-    
+
     char buf[10];
-        
+
     con.async_read_at_least(5,buf,10);
     con.async_read_at_least(5,buf,10);
     BOOST_CHECK( con.ec == make_error_code(websocketpp::transport::iostream::error::double_read) );
@@ -213,27 +213,27 @@ BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
 
 BOOST_AUTO_TEST_CASE( async_read_at_least ) {
     stub_con con(true,a,e);
-    
+
     char buf[10];
-    
+
     memset(buf,'x',10);
-    
+
     con.async_read_at_least(5,buf,10);
     BOOST_CHECK( con.ec == make_error_code(websocketpp::error::test) );
-    
+
     std::stringstream channel;
 	channel << "abcd";
 	channel >> con;
 	BOOST_CHECK( channel.tellg() == -1 );
     BOOST_CHECK( con.ec == make_error_code(websocketpp::error::test) );
-    
+
     std::stringstream channel2;
 	channel2 << "e";
 	channel2 >> con;
 	BOOST_CHECK( channel2.tellg() == -1 );
     BOOST_CHECK( !con.ec );
     BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
-    
+
     std::stringstream channel3;
 	channel3 << "f";
 	channel3 >> con;
@@ -249,21 +249,21 @@ BOOST_AUTO_TEST_CASE( async_read_at_least ) {
 
 BOOST_AUTO_TEST_CASE( async_read_at_least2 ) {
     stub_con con(true,a,e);
-    
+
     char buf[10];
-    
+
     memset(buf,'x',10);
-    
+
     con.async_read_at_least(5,buf,5);
     BOOST_CHECK( con.ec == make_error_code(websocketpp::error::test) );
-    
+
     std::stringstream channel;
 	channel << "abcdefg";
 	channel >> con;
     BOOST_CHECK( channel.tellg() == 5 );
     BOOST_CHECK( !con.ec );
     BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
-    
+
     con.async_read_at_least(1,buf+5,5);
 	channel >> con;
 	BOOST_CHECK( channel.tellg() == -1 );
@@ -275,8 +275,8 @@ void timer_callback_stub(const websocketpp::lib::error_code & ec) {}
 
 BOOST_AUTO_TEST_CASE( set_timer ) {
     stub_con con(true,a,e);
-    
+
     stub_con::timer_ptr tp = con.set_timer(1000,timer_callback_stub);
-    
+
     BOOST_CHECK( !tp );
 }
diff --git a/test/transport/iostream/endpoint.cpp b/test/transport/iostream/endpoint.cpp
index c5321a4e1f..3fc8589fb0 100644
--- a/test/transport/iostream/endpoint.cpp
+++ b/test/transport/iostream/endpoint.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE transport_iostream_endpoint
@@ -36,6 +36,6 @@ BOOST_AUTO_TEST_CASE( placeholder ) {}
 
 /*BOOST_AUTO_TEST_CASE( blank_error ) {
 	websocketpp::lib::error_code ec;
-		
+
     BOOST_CHECK( !ec );
-}*/
\ No newline at end of file
+}*/
diff --git a/test/utility/close.cpp b/test/utility/close.cpp
index 6d4881534b..d64208f965 100644
--- a/test/utility/close.cpp
+++ b/test/utility/close.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE close
@@ -62,25 +62,25 @@ BOOST_AUTO_TEST_CASE( invalid_values ) {
 BOOST_AUTO_TEST_CASE( value_extraction ) {
 	lib::error_code ec;
 	std::string payload = "oo";
-	
+
 	// Value = 1000
 	payload[0] = 0x03;
 	payload[1] = char(0xe8);
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::normal );
 	BOOST_CHECK( !ec );
-	
+
 	// Value = 1004
 	payload[0] = 0x03;
 	payload[1] = char(0xec);
 	BOOST_CHECK( close::extract_code(payload,ec) == 1004 );
 	BOOST_CHECK( ec == error::reserved_close_code );
-	
+
 	// Value = 1005
 	payload[0] = 0x03;
 	payload[1] = char(0xed);
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
 	BOOST_CHECK( ec == error::invalid_close_code );
-	
+
 	// Value = 3000
 	payload[0] = 0x0b;
 	payload[1] = char(0xb8);
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE( value_extraction ) {
 BOOST_AUTO_TEST_CASE( extract_empty ) {
 	lib::error_code ec;
 	std::string payload = "";
-	
+
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
 	BOOST_CHECK( !ec );
 }
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE( extract_empty ) {
 BOOST_AUTO_TEST_CASE( extract_short ) {
 	lib::error_code ec;
 	std::string payload = "0";
-	
+
 	BOOST_CHECK( close::extract_code(payload,ec) == close::status::protocol_error );
 	BOOST_CHECK( ec == error::bad_close_code );
 }
@@ -107,21 +107,21 @@ BOOST_AUTO_TEST_CASE( extract_short ) {
 BOOST_AUTO_TEST_CASE( extract_reason ) {
 	lib::error_code ec;
 	std::string payload = "00Foo";
-	
+
 	BOOST_CHECK( close::extract_reason(payload,ec) == "Foo" );
 	BOOST_CHECK( !ec );
-	
+
 	payload = "";
 	BOOST_CHECK( close::extract_reason(payload,ec) == "" );
 	BOOST_CHECK( !ec );
-	
+
 	payload = "00";
 	BOOST_CHECK( close::extract_reason(payload,ec) == "" );
 	BOOST_CHECK( !ec );
-	
+
 	payload = "000";
 	payload[2] = char(0xFF);
-	
+
 	close::extract_reason(payload,ec);
 	BOOST_CHECK( ec == error::invalid_utf8 );
-}
\ No newline at end of file
+}
diff --git a/test/utility/frame.cpp b/test/utility/frame.cpp
index 5eac8cf40d..2fd52039d8 100644
--- a/test/utility/frame.cpp
+++ b/test/utility/frame.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE frame
@@ -39,7 +39,7 @@ using namespace websocketpp;
 BOOST_AUTO_TEST_CASE( basic_bits ) {
 	frame::basic_header h1(0x00,0x00); // all false
 	frame::basic_header h2(0xF0,0x80); // all true
-	
+
 	// Read Values
 	BOOST_CHECK( frame::get_fin(h1) == false );
 	BOOST_CHECK( frame::get_rsv1(h1) == false );
@@ -52,20 +52,20 @@ BOOST_AUTO_TEST_CASE( basic_bits ) {
 	BOOST_CHECK( frame::get_rsv2(h2) == true );
 	BOOST_CHECK( frame::get_rsv3(h2) == true );
 	BOOST_CHECK( frame::get_masked(h2) == true );
-	
+
 	// Set Values
 	frame::set_fin(h1,true);
 	BOOST_CHECK( h1.b0 == 0x80 );
-	
+
 	frame::set_rsv1(h1,true);
 	BOOST_CHECK( h1.b0 == 0xC0 );
-	
+
 	frame::set_rsv2(h1,true);
 	BOOST_CHECK( h1.b0 == 0xE0 );
-	
+
 	frame::set_rsv3(h1,true);
 	BOOST_CHECK( h1.b0 == 0xF0 );
-	
+
 	frame::set_masked(h1,true);
 	BOOST_CHECK( h1.b1 == 0x80 );
 }
@@ -105,19 +105,19 @@ BOOST_AUTO_TEST_CASE( basic_size ) {
 	BOOST_CHECK( frame::get_basic_size(h4) == 126 );
 	BOOST_CHECK( frame::get_basic_size(h5) == 127 );
 	BOOST_CHECK( frame::get_basic_size(h6) == 0 );
-	
+
 	/*frame::set_basic_size(h1,1);
 	BOOST_CHECK( h1.b1 == 0x01 );
-	
+
 	frame::set_basic_size(h1,125);
 	BOOST_CHECK( h1.b1 == 0x7D );
-	
+
 	frame::set_basic_size(h1,126);
 	BOOST_CHECK( h1.b1 == 0x7E );
-	
+
 	frame::set_basic_size(h1,127);
 	BOOST_CHECK( h1.b1 == 0x7F );
-	
+
 	frame::set_basic_size(h1,0);
 	BOOST_CHECK( h1.b1 == 0x00 );*/
 }
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE( basic_header_length ) {
 
 BOOST_AUTO_TEST_CASE( basic_opcode ) {
 	frame::basic_header h1(0x00,0x00);
-	
+
 	BOOST_CHECK( is_control(frame::opcode::CONTINUATION) == false);
 	BOOST_CHECK( is_control(frame::opcode::TEXT) == false);
 	BOOST_CHECK( is_control(frame::opcode::BINARY) == false);
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE( extended_header_basics ) {
 	frame::extended_header h1;
 	uint8_t h1_solution[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-	
+
 	frame::extended_header h2(uint16_t(255));
 	uint8_t h2_solution[12] = {0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
 		                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE( extended_header_extractors ) {
 	BOOST_CHECK( get_payload_size(h2,e2) == 0x0807060504030201LL );
 	BOOST_CHECK( get_masking_key_offset(h2) == 8 );
 	BOOST_CHECK( get_masking_key(h2,e2).i == 0 );
-		
+
 	frame::basic_header h3(0x00,0xFE);
 	frame::extended_header e3(uint16_t(255),0x08040201);
 	BOOST_CHECK( get_extended_size(e3) == 255 );
@@ -217,25 +217,25 @@ BOOST_AUTO_TEST_CASE( header_preparation ) {
 	frame::basic_header h1(0x81,0xFF); //
 	frame::extended_header e1(uint64_t(0xFFFFFLL),htonl(0xD5FB70EE));
 	std::string p1 = prepare_header(h1, e1);
-	uint8_t s1[14] = {0x81, 0xFF, 
-	                 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 
+	uint8_t s1[14] = {0x81, 0xFF,
+	                 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF,
 	                 0xD5, 0xFB, 0x70, 0xEE};
-	
+
 	BOOST_CHECK( p1.size() == 14);
 	BOOST_CHECK( std::equal(p1.begin(),p1.end(),reinterpret_cast<char*>(s1)) );
-	
+
 	frame::basic_header h2(0x81,0x7E); //
 	frame::extended_header e2(uint16_t(255));
 	std::string p2 = prepare_header(h2, e2);
 	uint8_t s2[4] = {0x81, 0x7E, 0x00, 0xFF};
-	
+
 	BOOST_CHECK( p2.size() == 4);
 	BOOST_CHECK( std::equal(p2.begin(),p2.end(),reinterpret_cast<char*>(s2)) );
 }
 
 BOOST_AUTO_TEST_CASE( prepare_masking_key ) {
 	frame::masking_key_type key;
-	
+
 	key.i = htonl(0x12345678);
 
 	if (sizeof(size_t) == 8) {
@@ -266,14 +266,14 @@ BOOST_AUTO_TEST_CASE( prepare_masking_key2 ) {
 BOOST_AUTO_TEST_CASE( circshift ) {
     /*if (sizeof(size_t) == 8) {
         size_t test = 0x0123456789abcdef;
-        
+
         BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x0123456789abcdef);
         BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0xef0123456789abcd);
         BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0xcdef0123456789ab);
         BOOST_CHECK( frame::circshift_prepared_key(test,3) == 0xabcdef0123456789);
     } else {
         size_t test = 0x01234567;
-        
+
         BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x01234567);
         BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0x67012345);
         BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0x45670123);
@@ -282,13 +282,13 @@ BOOST_AUTO_TEST_CASE( circshift ) {
 }
 
 BOOST_AUTO_TEST_CASE( block_byte_mask ) {
-	uint8_t input[15] = {0x00, 0x00, 0x00, 0x00, 
+	uint8_t input[15] = {0x00, 0x00, 0x00, 0x00,
 		                 0x00, 0x00, 0x00, 0x00,
                          0x00, 0x00, 0x00, 0x00,
                          0x00, 0x00, 0x00};
-	
+
 	uint8_t output[15];
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -299,18 +299,18 @@ BOOST_AUTO_TEST_CASE( block_byte_mask ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	byte_mask(input,input+15,output,key);
-	
+
 	BOOST_CHECK( std::equal(output,output+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_byte_mask_inplace ) {
-	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00, 
+	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
 		                  0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00};
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -321,20 +321,20 @@ BOOST_AUTO_TEST_CASE( block_byte_mask_inplace ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	byte_mask(buffer,buffer+15,key);
 
 	BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_word_mask ) {
-	uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00, 
+	uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00};
-	
+
 	uint8_t output[15];
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -345,18 +345,18 @@ BOOST_AUTO_TEST_CASE( block_word_mask ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	word_mask_exact(input,output,15,key);
 
 	BOOST_CHECK( std::equal(output,output+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
-	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00, 
+	uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00, 0x00,
                           0x00, 0x00, 0x00};
-	
+
 	uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -367,7 +367,7 @@ BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
 	key.c[1] = 0x01;
 	key.c[2] = 0x02;
 	key.c[3] = 0x03;
-	
+
 	word_mask_exact(buffer,15,key);
 
 	BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
 BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
 	uint8_t input[16];
 	uint8_t output[16];
-	
+
 	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -400,7 +400,7 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
 	pkey = frame::prepare_masking_key(key);
 	std::fill_n(input,16,0x00);
 	std::fill_n(output,16,0x00);
-	
+
 	pkey_temp = frame::word_mask_circ(input,output,7,pkey);
 	BOOST_CHECK( std::equal(output,output+7,masked) );
 	BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
@@ -413,7 +413,7 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
 BOOST_AUTO_TEST_CASE( continuous_byte_mask ) {
 	uint8_t input[16];
 	uint8_t output[16];
-	
+
 	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -437,7 +437,7 @@ BOOST_AUTO_TEST_CASE( continuous_byte_mask ) {
 	pkey = frame::prepare_masking_key(key);
 	std::fill_n(input,16,0x00);
 	std::fill_n(output,16,0x00);
-	
+
 	pkey_temp = frame::byte_mask_circ(input,output,7,pkey);
 	BOOST_CHECK( std::equal(output,output+7,masked) );
 	BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
@@ -449,7 +449,7 @@ BOOST_AUTO_TEST_CASE( continuous_byte_mask ) {
 
 BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
 	uint8_t buffer[16];
-	
+
 	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -471,7 +471,7 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
 	// calls not split on word boundaries
 	pkey = frame::prepare_masking_key(key);
 	std::fill_n(buffer,16,0x00);
-	
+
 	pkey_temp = frame::word_mask_circ(buffer,7,pkey);
 	BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
 	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
@@ -483,7 +483,7 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
 
 BOOST_AUTO_TEST_CASE( continuous_byte_mask_inplace ) {
 	uint8_t buffer[16];
-	
+
 	uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
                           0x00, 0x01, 0x02, 0x03,
@@ -505,7 +505,7 @@ BOOST_AUTO_TEST_CASE( continuous_byte_mask_inplace ) {
 	// calls not split on word boundaries
 	pkey = frame::prepare_masking_key(key);
 	std::fill_n(buffer,16,0x00);
-	
+
 	pkey_temp = frame::byte_mask_circ(buffer,7,pkey);
 	BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
 	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
@@ -515,11 +515,11 @@ BOOST_AUTO_TEST_CASE( continuous_byte_mask_inplace ) {
 	BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
 }
 
-BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {	
+BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {
 	uint8_t buffer[12] = {0xA6, 0x15, 0x97, 0xB9,
                           0x81, 0x50, 0xAC, 0xBA,
                           0x9C, 0x1C, 0x9F, 0xF4};
-                          
+
     uint8_t unmasked[12] = {0x48, 0x65, 0x6C, 0x6C,
                             0x6F, 0x20, 0x57, 0x6F,
                             0x72, 0x6C, 0x64, 0x21};
diff --git a/test/utility/sha1.cpp b/test/utility/sha1.cpp
index 4f43bdde37..500e29788a 100644
--- a/test/utility/sha1.cpp
+++ b/test/utility/sha1.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE sha1
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE( sha1_test_b ) {
 BOOST_AUTO_TEST_CASE( sha1_test_c ) {
     websocketpp::sha1 sha;
     uint32_t digest[5];
-    
+
     for (int i = 1; i <= 1000000; i++) {
         sha.input('a');
     }
diff --git a/test/utility/uri.cpp b/test/utility/uri.cpp
index f85fa99830..e88a8d92b1 100644
--- a/test/utility/uri.cpp
+++ b/test/utility/uri.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE uri
@@ -36,7 +36,7 @@
 // Test a regular valid ws URI
 BOOST_AUTO_TEST_CASE( uri_valid ) {
     websocketpp::uri uri("ws://localhost:9000/chat");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( !uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE( uri_valid ) {
 // Test a regular valid ws URI
 BOOST_AUTO_TEST_CASE( uri_valid_no_port_unsecure ) {
     websocketpp::uri uri("ws://localhost/chat");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( !uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE( uri_valid_no_port_unsecure ) {
 // Valid URI with no port (secure)
 BOOST_AUTO_TEST_CASE( uri_valid_no_port_secure ) {
     websocketpp::uri uri("wss://localhost/chat");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
@@ -72,31 +72,31 @@ BOOST_AUTO_TEST_CASE( uri_valid_no_port_secure ) {
 // Valid URI with no resource
 BOOST_AUTO_TEST_CASE( uri_valid_no_resource ) {
     websocketpp::uri uri("wss://localhost:9000");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
     BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
 // Valid URI IPv6 Literal
 BOOST_AUTO_TEST_CASE( uri_valid_ipv6_literal ) {
     websocketpp::uri uri("wss://[::1]:9000/chat");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
     BOOST_CHECK_EQUAL( uri.get_host(), "::1");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
 // Valid URI with more complicated host
 BOOST_AUTO_TEST_CASE( uri_valid_2 ) {
     websocketpp::uri uri("wss://thor-websocket.zaphoyd.net:88/");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
@@ -108,14 +108,14 @@ BOOST_AUTO_TEST_CASE( uri_valid_2 ) {
 
 // Invalid URI (port too long)
 BOOST_AUTO_TEST_CASE( uri_invalid_long_port ) {
-    websocketpp::uri uri("wss://localhost:900000/chat");        
-    
+    websocketpp::uri uri("wss://localhost:900000/chat");
+
     BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI (bogus scheme method)
 BOOST_AUTO_TEST_CASE( uri_invalid_scheme ) {
-    websocketpp::uri uri("foo://localhost:9000/chat");     
+    websocketpp::uri uri("foo://localhost:9000/chat");
 
     BOOST_CHECK( !uri.get_valid() );
 }
@@ -123,70 +123,70 @@ BOOST_AUTO_TEST_CASE( uri_invalid_scheme ) {
 // Valid URI (http method)
 BOOST_AUTO_TEST_CASE( uri_http_scheme ) {
     websocketpp::uri uri("http://localhost:9000/chat");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( !uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "http");
     BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );     
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
 // Valid URI IPv4 literal
 BOOST_AUTO_TEST_CASE( uri_valid_ipv4_literal ) {
     websocketpp::uri uri("wss://127.0.0.1:9000/chat");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
     BOOST_CHECK_EQUAL( uri.get_host(), "127.0.0.1");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
 }
 
 // Valid URI complicated resource path
 BOOST_AUTO_TEST_CASE( uri_valid_3 ) {
     websocketpp::uri uri("wss://localhost:9000/chat/foo/bar");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
     BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar" );
 }
 
 // Invalid URI broken method separator
 BOOST_AUTO_TEST_CASE( uri_invalid_method_separator ) {
-    websocketpp::uri uri("wss:/localhost:9000/chat");       
+    websocketpp::uri uri("wss:/localhost:9000/chat");
 
     BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI port > 65535
 BOOST_AUTO_TEST_CASE( uri_invalid_gt_16_bit_port ) {
-    websocketpp::uri uri("wss:/localhost:70000/chat");      
+    websocketpp::uri uri("wss:/localhost:70000/chat");
 
     BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI includes uri fragment
 BOOST_AUTO_TEST_CASE( uri_invalid_fragment ) {
-    websocketpp::uri uri("wss:/localhost:70000/chat#foo");      
+    websocketpp::uri uri("wss:/localhost:70000/chat#foo");
 
     BOOST_CHECK( !uri.get_valid() );
 }
 
 // Invalid URI with no brackets around IPv6 literal
 BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_1 ) {
-    websocketpp::uri uri("wss://::1/chat");     
+    websocketpp::uri uri("wss://::1/chat");
 
     BOOST_CHECK( !uri.get_valid() );
 }
 
-// Invalid URI with port and no brackets around IPv6 literal 
+// Invalid URI with port and no brackets around IPv6 literal
 BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_2 ) {
-    websocketpp::uri uri("wss://::1:2009/chat");        
+    websocketpp::uri uri("wss://::1:2009/chat");
 
     BOOST_CHECK( !uri.get_valid() );
 }
@@ -194,43 +194,43 @@ BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_2 ) {
 // Valid URI complicated resource path with query
 BOOST_AUTO_TEST_CASE( uri_valid_4 ) {
     websocketpp::uri uri("wss://localhost:9000/chat/foo/bar?foo=bar");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
     BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar?foo=bar" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar?foo=bar" );
 }
 
 // Valid URI with a mapped v4 ipv6 literal
 BOOST_AUTO_TEST_CASE( uri_valid_v4_mapped ) {
     websocketpp::uri uri("wss://[0000:0000:0000:0000:0000:0000:192.168.1.1]:9000/");
-    
+
     BOOST_CHECK( uri.get_valid() );
     BOOST_CHECK( uri.get_secure() );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
     BOOST_CHECK_EQUAL( uri.get_host(), "0000:0000:0000:0000:0000:0000:192.168.1.1");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
 // Valid URI with a v6 address with mixed case
 BOOST_AUTO_TEST_CASE( uri_valid_v6_mixed_case ) {
     websocketpp::uri uri("wss://[::10aB]:9000/");
-    
+
     BOOST_CHECK( uri.get_valid() == true );
     BOOST_CHECK( uri.get_secure() == true );
     BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
     BOOST_CHECK_EQUAL( uri.get_host(), "::10aB");
     BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
-    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );       
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
 }
 
 // Invalid IPv6 literal
 /*BOOST_AUTO_TEST_CASE( uri_invalid_v6_nonhex ) {
     websocketpp::uri uri("wss://[g::1]:9000/");
-    
+
     BOOST_CHECK( uri.get_valid() == false );
 }*/
 
diff --git a/test/utility/utilities.cpp b/test/utility/utilities.cpp
index 557dedb8cb..8cbb8c3cc5 100644
--- a/test/utility/utilities.cpp
+++ b/test/utility/utilities.cpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 //#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE utility
@@ -38,34 +38,34 @@ BOOST_AUTO_TEST_SUITE ( utility )
 BOOST_AUTO_TEST_CASE( substr_found ) {
     std::string haystack = "abc123";
     std::string needle = "abc";
-    
+
     BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
 }
 
 BOOST_AUTO_TEST_CASE( substr_found_ci ) {
     std::string haystack = "abc123";
     std::string needle = "aBc";
-    
+
     BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
 }
 
 BOOST_AUTO_TEST_CASE( substr_not_found ) {
     std::string haystack = "abd123";
     std::string needle = "abcd";
-    
+
     BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) == haystack.end());
 }
 
 BOOST_AUTO_TEST_CASE( to_lower ) {
     std::string in = "AbCd";
-    
+
     BOOST_CHECK_EQUAL(websocketpp::utility::to_lower(in), "abcd");
 }
 
 BOOST_AUTO_TEST_CASE( string_replace_all ) {
     std::string source = "foo \"bar\" baz";
     std::string dest = "foo \\\"bar\\\" baz";
-    
+
     using websocketpp::utility::string_replace_all;
     BOOST_CHECK_EQUAL(string_replace_all(source,"\"","\\\""),dest);
 }
diff --git a/websocketpp/base64/base64.cpp b/websocketpp/base64/base64.cpp
index 7b88fb7e49..8738802294 100644
--- a/websocketpp/base64/base64.cpp
+++ b/websocketpp/base64/base64.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
    base64.cpp and base64.h
 
    Copyright (C) 2004-2008 René Nyffenegger
@@ -28,7 +28,7 @@
 #include "base64.h"
 #include <iostream>
 
-static const std::string base64_chars = 
+static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
              "abcdefghijklmnopqrstuvwxyz"
              "0123456789+/";
diff --git a/websocketpp/base64/base64.hpp b/websocketpp/base64/base64.hpp
index 6c12ec19c8..aa2fc8f177 100644
--- a/websocketpp/base64/base64.hpp
+++ b/websocketpp/base64/base64.hpp
@@ -1,12 +1,12 @@
-/* 
+/*
     ******
-    base64.hpp is a repackaging of the base64.cpp and base64.h files into a 
-    single headersuitable for use as a header only library. This conversion was 
+    base64.hpp is a repackaging of the base64.cpp and base64.h files into a
+    single headersuitable for use as a header only library. This conversion was
     done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to
-    the code are redistributed under the same license as the original, which is 
+    the code are redistributed under the same license as the original, which is
     listed below.
     ******
-   
+
    base64.cpp and base64.h
 
    Copyright (C) 2004-2008 René Nyffenegger
@@ -38,7 +38,7 @@
 
 #include <string>
 
-static const std::string base64_chars = 
+static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
              "abcdefghijklmnopqrstuvwxyz"
              "0123456789+/";
@@ -50,7 +50,7 @@ static inline bool is_base64(unsigned char c) {
            (c >= 97 && c <= 122)); // a-z
 }
 
-inline std::string base64_encode(unsigned char const* bytes_to_encode, unsigned 
+inline std::string base64_encode(unsigned char const* bytes_to_encode, unsigned
     int in_len)
 {
     std::string ret;
@@ -63,9 +63,9 @@ inline std::string base64_encode(unsigned char const* bytes_to_encode, unsigned
         char_array_3[i++] = *(bytes_to_encode++);
         if (i == 3) {
             char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-            char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + 
+            char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
                               ((char_array_3[1] & 0xf0) >> 4);
-            char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + 
+            char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) +
                               ((char_array_3[2] & 0xc0) >> 6);
             char_array_4[3] = char_array_3[2] & 0x3f;
 
@@ -82,9 +82,9 @@ inline std::string base64_encode(unsigned char const* bytes_to_encode, unsigned
         }
 
         char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + 
+        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
                           ((char_array_3[1] & 0xf0) >> 4);
-        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + 
+        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) +
                           ((char_array_3[2] & 0xc0) >> 6);
         char_array_4[3] = char_array_3[2] & 0x3f;
 
diff --git a/websocketpp/client.hpp b/websocketpp/client.hpp
index 8728e0f9dc..45268be387 100644
--- a/websocketpp/client.hpp
+++ b/websocketpp/client.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CLIENT_HPP
@@ -30,4 +30,4 @@
 
 #include <websocketpp/roles/client_endpoint.hpp>
 
-#endif //WEBSOCKETPP_CLIENT_HPP
\ No newline at end of file
+#endif //WEBSOCKETPP_CLIENT_HPP
diff --git a/websocketpp/close.hpp b/websocketpp/close.hpp
index 2509c34995..3df9007258 100644
--- a/websocketpp/close.hpp
+++ b/websocketpp/close.hpp
@@ -12,10 +12,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -23,7 +23,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CLOSE_HPP
@@ -33,10 +33,10 @@
  * A package of types and methods for manipulating WebSocket close codes.
  */
 
-#include <websocketpp/error.hpp> 
+#include <websocketpp/error.hpp>
 #include <websocketpp/common/network.hpp>
 #include <websocketpp/common/stdint.hpp>
-#include <websocketpp/utf8_validator.hpp> 
+#include <websocketpp/utf8_validator.hpp>
 
 #include <string>
 
@@ -47,7 +47,7 @@ namespace close {
 namespace status {
     /// The type of a close code value.
     typedef uint16_t value;
-    
+
     /// A blank value for internal use.
     static value const blank = 0;
 
@@ -62,7 +62,7 @@ namespace status {
     /// A protocol error occurred.
     static value const protocol_error = 1002;
 
-    /// The connection was terminated because an endpoint received a type of 
+    /// The connection was terminated because an endpoint received a type of
     /// data it cannot accept.
     /**
      * (e.g., an endpoint that understands only text data MAY send this if it
@@ -160,8 +160,8 @@ namespace status {
      * determine if the system has the capability of waiting for a close
      * acknowledgement or if it should drop the TCP connection immediately
      * after sending its close frame.
-     * 
-     * @param [in] code The value to test. 
+     *
+     * @param [in] code The value to test.
      * @return True if the code represents an unrecoverable error
      */
     inline bool terminal(value code) {
@@ -208,7 +208,7 @@ inline status::value extract_code(std::string const & payload, lib::error_code
     val.c[0] = payload[0];
     val.c[1] = payload[1];
 
-    status::value code(ntohs(val.i));    
+    status::value code(ntohs(val.i));
 
     if (status::invalid(code)) {
         ec = make_error_code(error::invalid_close_code);
diff --git a/websocketpp/common/chrono.hpp b/websocketpp/common/chrono.hpp
index e7e8e5f0bb..731d7703ae 100644
--- a/websocketpp/common/chrono.hpp
+++ b/websocketpp/common/chrono.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_CHRONO_HPP
diff --git a/websocketpp/common/connection_hdl.hpp b/websocketpp/common/connection_hdl.hpp
index 969e30c0fe..e7177dabf8 100644
--- a/websocketpp/common/connection_hdl.hpp
+++ b/websocketpp/common/connection_hdl.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
diff --git a/websocketpp/common/cpp11.hpp b/websocketpp/common/cpp11.hpp
index 336661ff57..2a638dce6a 100644
--- a/websocketpp/common/cpp11.hpp
+++ b/websocketpp/common/cpp11.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_CPP11_HPP
@@ -69,7 +69,7 @@
             #endif
         #endif
     #endif
-    
+
     // Test for constexpr
     #ifndef _WEBSOCKETPP_CONSTEXPR_TOKEN_
         #ifdef _WEBSOCKETPP_CONSTEXPR_
@@ -85,7 +85,7 @@
             #endif
         #endif
     #endif
-    
+
     // Enable initializer lists on clang when available.
     #if __has_feature(cxx_generalized_initializers) && !defined(_WEBSOCKETPP_INITIALIZER_LISTS_)
         #define _WEBSOCKETPP_INITIALIZER_LISTS_
diff --git a/websocketpp/common/functional.hpp b/websocketpp/common/functional.hpp
index 682df600ed..8c52c08cca 100644
--- a/websocketpp/common/functional.hpp
+++ b/websocketpp/common/functional.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
diff --git a/websocketpp/common/md5.hpp b/websocketpp/common/md5.hpp
index 352521cb99..70eaff89cf 100644
--- a/websocketpp/common/md5.hpp
+++ b/websocketpp/common/md5.hpp
@@ -1,7 +1,7 @@
 /*
   md5.hpp is a reformulation of the md5.h and md5.c code to allow it to function
   as a component of a header only library. This conversion was done by Peter
-  Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The 
+  Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The
   changes are released under the same license as the original (listed below)
 */
 /*
@@ -413,17 +413,17 @@ void md5_finish(md5_state_t *pms, md5_byte_t digest[16]) {
 // some convenience c++ functions
 inline std::string md5_hash_string(std::string const & s) {
 	char digest[16];
-	
+
 	md5_state_t state;
-	
+
 	md5_init(&state);
 	md5_append(&state, (md5_byte_t const *)s.c_str(), s.size());
 	md5_finish(&state, (md5_byte_t *)digest);
-	    
+
     std::string ret;
     ret.resize(16);
     std::copy(digest,digest+16,ret.begin());
-    
+
 	return ret;
 }
 
@@ -432,12 +432,12 @@ const char hexval[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a',
 inline std::string md5_hash_hex(std::string const & input) {
     std::string hash = md5_hash_string(input);
     std::string hex;
-        
+
     for (size_t i = 0; i < hash.size(); i++) {
         hex.push_back(hexval[((hash[i] >> 4) & 0xF)]);
         hex.push_back(hexval[(hash[i]) & 0x0F]);
     }
-    
+
     return hex;
 }
 
diff --git a/websocketpp/common/memory.hpp b/websocketpp/common/memory.hpp
index 5378b44c5a..65a5b906ea 100644
--- a/websocketpp/common/memory.hpp
+++ b/websocketpp/common/memory.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_MEMORY_HPP
diff --git a/websocketpp/common/network.hpp b/websocketpp/common/network.hpp
index eb3d44f5b2..6a01f140cb 100644
--- a/websocketpp/common/network.hpp
+++ b/websocketpp/common/network.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_NETWORK_HPP
@@ -46,32 +46,32 @@ inline bool is_little_endian() {
     return (ptr[0] == 1);
 }
 
-#define TYP_INIT 0 
-#define TYP_SMLE 1 
-#define TYP_BIGE 2 
+#define TYP_INIT 0
+#define TYP_SMLE 1
+#define TYP_BIGE 2
 
-inline uint64_t htonll(uint64_t src) { 
-    static int typ = TYP_INIT; 
-    unsigned char c; 
-    union { 
-        uint64_t ull; 
-        unsigned char c[8]; 
-    } x; 
-    if (typ == TYP_INIT) { 
-        x.ull = 0x01; 
-        typ = (x.c[7] == 0x01ULL) ? TYP_BIGE : TYP_SMLE; 
-    } 
-    if (typ == TYP_BIGE) 
+inline uint64_t htonll(uint64_t src) {
+    static int typ = TYP_INIT;
+    unsigned char c;
+    union {
+        uint64_t ull;
+        unsigned char c[8];
+    } x;
+    if (typ == TYP_INIT) {
+        x.ull = 0x01;
+        typ = (x.c[7] == 0x01ULL) ? TYP_BIGE : TYP_SMLE;
+    }
+    if (typ == TYP_BIGE)
         return src;
-    x.ull = src; 
-    c = x.c[0]; x.c[0] = x.c[7]; x.c[7] = c; 
-    c = x.c[1]; x.c[1] = x.c[6]; x.c[6] = c; 
-    c = x.c[2]; x.c[2] = x.c[5]; x.c[5] = c; 
-    c = x.c[3]; x.c[3] = x.c[4]; x.c[4] = c; 
-    return x.ull; 
+    x.ull = src;
+    c = x.c[0]; x.c[0] = x.c[7]; x.c[7] = c;
+    c = x.c[1]; x.c[1] = x.c[6]; x.c[6] = c;
+    c = x.c[2]; x.c[2] = x.c[5]; x.c[5] = c;
+    c = x.c[3]; x.c[3] = x.c[4]; x.c[4] = c;
+    return x.ull;
 }
 
-inline uint64_t ntohll(uint64_t src) { 
+inline uint64_t ntohll(uint64_t src) {
     return htonll(src);
 }
 
diff --git a/websocketpp/common/platforms.hpp b/websocketpp/common/platforms.hpp
index 2d87404320..4e031aa345 100644
--- a/websocketpp/common/platforms.hpp
+++ b/websocketpp/common/platforms.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,17 +22,17 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_PLATFORMS_HPP
 #define WEBSOCKETPP_COMMON_PLATFORMS_HPP
 
 /**
- * This header contains any platform specific preprocessor adjustments that 
+ * This header contains any platform specific preprocessor adjustments that
  * don't fit somewhere else better.
  */
- 
+
 #if defined(WIN32) && !defined(NOMINMAX)
     // don't define min and max macros that conflict with std::min and std::max
     #define NOMINMAX
diff --git a/websocketpp/common/random.hpp b/websocketpp/common/random.hpp
index 9ee2b611e3..fe1395161c 100644
--- a/websocketpp/common/random.hpp
+++ b/websocketpp/common/random.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
@@ -38,7 +38,7 @@
     #include <random>
 #else
     #include <boost/version.hpp>
-    
+
     #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 46
         #include <boost/random/uniform_int_distribution.hpp>
         #include <boost/random/random_device.hpp>
diff --git a/websocketpp/common/regex.hpp b/websocketpp/common/regex.hpp
index 7a285e1b40..b85cd70955 100644
--- a/websocketpp/common/regex.hpp
+++ b/websocketpp/common/regex.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_REGEX_HPP
diff --git a/websocketpp/common/stdint.hpp b/websocketpp/common/stdint.hpp
index d272b39cf7..233e36f5bc 100644
--- a/websocketpp/common/stdint.hpp
+++ b/websocketpp/common/stdint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_STDINT_HPP
diff --git a/websocketpp/common/system_error.hpp b/websocketpp/common/system_error.hpp
index 58a4c25602..fff3dfe9ce 100644
--- a/websocketpp/common/system_error.hpp
+++ b/websocketpp/common/system_error.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
diff --git a/websocketpp/common/thread.hpp b/websocketpp/common/thread.hpp
index e8abd035ae..e02a6582df 100644
--- a/websocketpp/common/thread.hpp
+++ b/websocketpp/common/thread.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_COMMON_THREAD_HPP
diff --git a/websocketpp/concurrency/basic.hpp b/websocketpp/concurrency/basic.hpp
index ed2fb7d606..84e61b367b 100644
--- a/websocketpp/concurrency/basic.hpp
+++ b/websocketpp/concurrency/basic.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONCURRENCY_BASIC_HPP
@@ -37,10 +37,10 @@ namespace concurrency {
 class basic {
 public:
     typedef lib::mutex mutex_type;
-    typedef lib::lock_guard<mutex_type> scoped_lock_type; 
+    typedef lib::lock_guard<mutex_type> scoped_lock_type;
 };
 
 } // namespace concurrency
 } // namespace websocketpp
 
-#endif // WEBSOCKETPP_CONCURRENCY_BASIC_HPP
\ No newline at end of file
+#endif // WEBSOCKETPP_CONCURRENCY_BASIC_HPP
diff --git a/websocketpp/concurrency/none.hpp b/websocketpp/concurrency/none.hpp
index 8c240e1d58..9d19d64ce4 100644
--- a/websocketpp/concurrency/none.hpp
+++ b/websocketpp/concurrency/none.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONCURRENCY_NONE_HPP
diff --git a/websocketpp/config/asio.hpp b/websocketpp/config/asio.hpp
index d0fed07c17..b2070edb25 100644
--- a/websocketpp/config/asio.hpp
+++ b/websocketpp/config/asio.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
@@ -43,19 +43,19 @@ namespace config {
 struct asio_tls : public core {
     typedef asio_tls type;
     typedef core base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
 
     struct transport_config : public base::transport_config {
@@ -67,7 +67,7 @@ struct asio_tls : public core {
         typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
 };
 
diff --git a/websocketpp/config/asio_client.hpp b/websocketpp/config/asio_client.hpp
index b145940609..26d4c4db96 100644
--- a/websocketpp/config/asio_client.hpp
+++ b/websocketpp/config/asio_client.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
@@ -43,19 +43,19 @@ namespace config {
 struct asio_tls_client : public core_client {
     typedef asio_tls_client type;
     typedef core_client base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
 
     struct transport_config : public base::transport_config {
@@ -67,7 +67,7 @@ struct asio_tls_client : public core_client {
         typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
 };
 
diff --git a/websocketpp/config/asio_no_tls.hpp b/websocketpp/config/asio_no_tls.hpp
index 71e2135485..a40e99a8bb 100644
--- a/websocketpp/config/asio_no_tls.hpp
+++ b/websocketpp/config/asio_no_tls.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_ASIO_HPP
@@ -38,32 +38,32 @@ namespace config {
 struct asio : public core {
     typedef asio type;
     typedef core base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
-    
+
     struct transport_config : public base::transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::alog_type alog_type;
         typedef type::elog_type elog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
+        typedef websocketpp::transport::asio::basic_socket::endpoint
             socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
 };
 
diff --git a/websocketpp/config/asio_no_tls_client.hpp b/websocketpp/config/asio_no_tls_client.hpp
index ab80bb0ae0..8b9635f87c 100644
--- a/websocketpp/config/asio_no_tls_client.hpp
+++ b/websocketpp/config/asio_no_tls_client.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
@@ -38,32 +38,32 @@ namespace config {
 struct asio_client : public core_client {
     typedef asio_client type;
     typedef core_client base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
-    
+
     struct transport_config : public base::transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::alog_type alog_type;
         typedef type::elog_type elog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
+        typedef websocketpp::transport::asio::basic_socket::endpoint
             socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
 };
 
diff --git a/websocketpp/config/boost_config.hpp b/websocketpp/config/boost_config.hpp
index 7ebd6786a5..19c890538a 100644
--- a/websocketpp/config/boost_config.hpp
+++ b/websocketpp/config/boost_config.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
  // This header defines WebSocket++ macros for C++11 compatibility based on the Boost.Config library.
@@ -34,7 +34,7 @@
 
 #include <boost/config.hpp>
 
-//  _WEBSOCKETPP_CPP11_MEMORY_ and _WEBSOCKETPP_CPP11_FUNCTIONAL_ presently 
+//  _WEBSOCKETPP_CPP11_MEMORY_ and _WEBSOCKETPP_CPP11_FUNCTIONAL_ presently
 //  only work if either both or neither is defined.
 #if !defined BOOST_NO_CXX11_SMART_PTR && !defined BOOST_NO_CXX11_HDR_FUNCTIONAL
     #define _WEBSOCKETPP_CPP11_MEMORY_
@@ -61,11 +61,11 @@
     #define _WEBSOCKETPP_CPP11_THREAD_
 #endif
 
-#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST 
-    #define _WEBSOCKETPP_INITIALIZER_LISTS_ 
+#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+    #define _WEBSOCKETPP_INITIALIZER_LISTS_
 #endif
 
-#define _WEBSOCKETPP_NOEXCEPT_TOKEN_  BOOST_NOEXCEPT 
-#define _WEBSOCKETPP_CONSTEXPR_TOKEN_  BOOST_CONSTEXPR 
+#define _WEBSOCKETPP_NOEXCEPT_TOKEN_  BOOST_NOEXCEPT
+#define _WEBSOCKETPP_CONSTEXPR_TOKEN_  BOOST_CONSTEXPR
 
 #endif // WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
diff --git a/websocketpp/config/core.hpp b/websocketpp/config/core.hpp
index f9fa5cb00e..69744a19db 100644
--- a/websocketpp/config/core.hpp
+++ b/websocketpp/config/core.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_CORE_HPP
@@ -66,130 +66,130 @@ namespace config {
 /// Server config with iostream transport
 struct core {
     typedef core type;
-    
+
     // Concurrency policy
     typedef websocketpp::concurrency::basic concurrency_type;
-    
+
     // HTTP Parser Policies
     typedef http::parser::request request_type;
     typedef http::parser::response response_type;
 
     // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager> 
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
         message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type> 
+    typedef message_buffer::alloc::con_msg_manager<message_type>
         con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type> 
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
         endpoint_msg_manager_type;
-    
+
     /// Logging policies
     typedef websocketpp::log::basic<concurrency_type,
         websocketpp::log::elevel> elog_type;
     typedef websocketpp::log::basic<concurrency_type,
         websocketpp::log::alevel> alog_type;
-    
+
     /// RNG policies
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     struct transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::elog_type elog_type;
         typedef type::alog_type alog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        
+
         /// Default timer values (in ms)
-        
+
         /// Length of time to wait for socket pre-initialization
         /**
          * Exactly what this includes depends on the socket policy in use
          */
         static const long timeout_socket_pre_init = 5000;
-        
+
         /// Length of time to wait before a proxy handshake is aborted
         static const long timeout_proxy = 5000;
-        
+
         /// Length of time to wait for socket post-initialization
         /**
          * Exactly what this includes depends on the socket policy in use.
          * Often this means the TLS handshake
          */
         static const long timeout_socket_post_init = 5000;
-        
+
         /// Length of time to wait for dns resolution
         static const long timeout_dns_resolve = 5000;
-        
+
         /// Length of time to wait for TCP connect
         static const long timeout_connect = 5000;
-        
+
         /// Length of time to wait for socket shutdown
         static const long timeout_socket_shutdown = 5000;
     };
 
     /// Transport Endpoint Component
-    typedef websocketpp::transport::iostream::endpoint<transport_config> 
+    typedef websocketpp::transport::iostream::endpoint<transport_config>
         transport_type;
-    
+
     /// User overridable Endpoint base class
     typedef websocketpp::endpoint_base endpoint_base;
     /// User overridable Connection base class
     typedef websocketpp::connection_base connection_base;
-    
+
     /// Default timer values (in ms)
-    
+
     /// Length of time before an opening handshake is aborted
     static const long timeout_open_handshake = 5000;
     /// Length of time before a closing handshake is aborted
     static const long timeout_close_handshake = 5000;
     /// Length of time to wait for a pong after a ping
     static const long timeout_pong = 5000;
-    
+
     /// WebSocket Protocol version to use as a client
     /**
-     * What version of the WebSocket Protocol to use for outgoing client 
+     * What version of the WebSocket Protocol to use for outgoing client
      * connections. Setting this to a value other than 13 (RFC6455) is not
      * recommended.
-     */ 
+     */
     static const int client_version = 13; // RFC6455
-    
+
     /// Default static error logging channels
     /**
      * Which error logging channels to enable at compile time. Channels not
      * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely 
-     * code to test whether or not to print out log messages on a certain 
-     * channel 
-     * 
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
      * Default is all except for development/debug level errors
-     */ 
-    static const websocketpp::log::level elog_level = 
+     */
+    static const websocketpp::log::level elog_level =
         websocketpp::log::elevel::all ^ websocketpp::log::elevel::devel;
-        
+
     /// Default static access logging channels
     /**
      * Which access logging channels to enable at compile time. Channels not
      * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely 
-     * code to test whether or not to print out log messages on a certain 
-     * channel 
-     * 
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
      * Default is all except for development/debug level access messages
-     */ 
-    static const websocketpp::log::level alog_level = 
+     */
+    static const websocketpp::log::level alog_level =
         websocketpp::log::alevel::all ^ websocketpp::log::alevel::devel;
-    
-    /// 
+
+    ///
     static const size_t connection_read_buffer_size = 512;
-    
-    /// Drop connections immediately on protocol error. 
-    /** 
+
+    /// Drop connections immediately on protocol error.
+    /**
      * Drop connections on protocol error rather than sending a close frame.
      * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with 
+     * dropped as well. It may free up resources otherwise spent dealing with
      * misbehaving clients.
      */
     static const bool drop_on_protocol_error = false;
-    
+
     /// Suppresses the return of detailed connection close information
     /**
      * Silence close suppresses the return of detailed connection close
@@ -204,20 +204,20 @@ struct core {
      * sent by local applications.
      */
     static const bool silent_close = false;
-    
+
     /// Global flag for enabling/disabling extensions
     static const bool enable_extensions = true;
-    
+
     /// Extension specific settings:
 
     /// permessage_compress extension
     struct permessage_deflate_config {
         typedef core::request_type request_type;
-        
+
         /// If the remote endpoint requests that we reset the compression
         /// context after each message should we honor the request?
         static const bool allow_disabling_context_takeover = true;
-        
+
         /// If the remote endpoint requests that we reduce the size of the
         /// LZ77 sliding window size this is the lowest value that will be
         /// allowed. Values range from 8 to 15. A value of 8 means we will
@@ -231,14 +231,14 @@ struct core {
 
     /// Autonegotiate permessage-deflate
     /**
-     * Automatically enables the permessage-deflate extension. 
+     * Automatically enables the permessage-deflate extension.
      *
      * For clients this results in a permessage-deflate extension request being
      * sent with every request rather than requiring it to be requested manually
-     * 
+     *
      * For servers this results in accepting the first set of extension settings
      * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With 
+     * requiring the extension to be manually negotiated in `validate`. With
      * auto-negotiate on, you may still override the auto-negotiate manually if
      * needed.
      */
diff --git a/websocketpp/config/core_client.hpp b/websocketpp/config/core_client.hpp
index 1718751f2e..b7329756b8 100644
--- a/websocketpp/config/core_client.hpp
+++ b/websocketpp/config/core_client.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
@@ -66,131 +66,131 @@ namespace config {
 /// Client config with iostream transport
 struct core_client {
     typedef core_client type;
-    
+
     // Concurrency policy
     typedef websocketpp::concurrency::basic concurrency_type;
-    
+
     // HTTP Parser Policies
     typedef http::parser::request request_type;
     typedef http::parser::response response_type;
 
     // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager> 
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
         message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type> 
+    typedef message_buffer::alloc::con_msg_manager<message_type>
         con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type> 
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
         endpoint_msg_manager_type;
-    
+
     /// Logging policies
     typedef websocketpp::log::basic<concurrency_type,
         websocketpp::log::elevel> elog_type;
     typedef websocketpp::log::basic<concurrency_type,
         websocketpp::log::alevel> alog_type;
-    
+
     /// RNG policies
     typedef websocketpp::random::random_device::int_generator<uint32_t,
         concurrency_type> rng_type;
-    
+
     struct transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::elog_type elog_type;
         typedef type::alog_type alog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        
+
         /// Default timer values (in ms)
-        
+
         /// Length of time to wait for socket pre-initialization
         /**
          * Exactly what this includes depends on the socket policy in use
          */
         static const long timeout_socket_pre_init = 5000;
-        
+
         /// Length of time to wait before a proxy handshake is aborted
         static const long timeout_proxy = 5000;
-        
+
         /// Length of time to wait for socket post-initialization
         /**
          * Exactly what this includes depends on the socket policy in use.
          * Often this means the TLS handshake
          */
         static const long timeout_socket_post_init = 5000;
-        
+
         /// Length of time to wait for dns resolution
         static const long timeout_dns_resolve = 5000;
-        
+
         /// Length of time to wait for TCP connect
         static const long timeout_connect = 5000;
-        
+
         /// Length of time to wait for socket shutdown
         static const long timeout_socket_shutdown = 5000;
     };
 
     /// Transport Endpoint Component
-    typedef websocketpp::transport::iostream::endpoint<transport_config> 
+    typedef websocketpp::transport::iostream::endpoint<transport_config>
         transport_type;
-    
+
     /// User overridable Endpoint base class
     typedef websocketpp::endpoint_base endpoint_base;
     /// User overridable Connection base class
     typedef websocketpp::connection_base connection_base;
-    
+
     /// Default timer values (in ms)
-    
+
     /// Length of time before an opening handshake is aborted
     static const long timeout_open_handshake = 5000;
     /// Length of time before a closing handshake is aborted
     static const long timeout_close_handshake = 5000;
     /// Length of time to wait for a pong after a ping
     static const long timeout_pong = 5000;
-    
+
     /// WebSocket Protocol version to use as a client
     /**
-     * What version of the WebSocket Protocol to use for outgoing client 
+     * What version of the WebSocket Protocol to use for outgoing client
      * connections. Setting this to a value other than 13 (RFC6455) is not
      * recommended.
-     */ 
+     */
     static const int client_version = 13; // RFC6455
-    
+
     /// Default static error logging channels
     /**
      * Which error logging channels to enable at compile time. Channels not
      * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely 
-     * code to test whether or not to print out log messages on a certain 
-     * channel 
-     * 
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
      * Default is all except for development/debug level errors
-     */ 
-    static const websocketpp::log::level elog_level = 
+     */
+    static const websocketpp::log::level elog_level =
         websocketpp::log::elevel::all ^ websocketpp::log::elevel::devel;
-        
+
     /// Default static access logging channels
     /**
      * Which access logging channels to enable at compile time. Channels not
      * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely 
-     * code to test whether or not to print out log messages on a certain 
-     * channel 
-     * 
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
      * Default is all except for development/debug level access messages
-     */ 
-    static const websocketpp::log::level alog_level = 
+     */
+    static const websocketpp::log::level alog_level =
         websocketpp::log::alevel::all ^ websocketpp::log::alevel::devel;
-    
-    /// 
+
+    ///
     static const size_t connection_read_buffer_size = 512;
-    
-    /// Drop connections immediately on protocol error. 
-    /** 
+
+    /// Drop connections immediately on protocol error.
+    /**
      * Drop connections on protocol error rather than sending a close frame.
      * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with 
+     * dropped as well. It may free up resources otherwise spent dealing with
      * misbehaving clients.
      */
     static const bool drop_on_protocol_error = false;
-    
+
     /// Suppresses the return of detailed connection close information
     /**
      * Silence close suppresses the return of detailed connection close
@@ -205,20 +205,20 @@ struct core_client {
      * sent by local applications.
      */
     static const bool silent_close = false;
-    
+
     /// Global flag for enabling/disabling extensions
     static const bool enable_extensions = true;
-    
+
     /// Extension specific settings:
 
     /// permessage_deflate extension
     struct permessage_deflate_config {
         typedef core_client::request_type request_type;
-        
+
         /// If the remote endpoint requests that we reset the compression
         /// context after each message should we honor the request?
         static const bool allow_disabling_context_takeover = true;
-        
+
         /// If the remote endpoint requests that we reduce the size of the
         /// LZ77 sliding window size this is the lowest value that will be
         /// allowed. Values range from 8 to 15. A value of 8 means we will
@@ -232,14 +232,14 @@ struct core_client {
 
     /// Autonegotiate permessage-compress
     /**
-     * Automatically enables the permessage-compress extension. 
+     * Automatically enables the permessage-compress extension.
      *
      * For clients this results in a permessage-compress extension request being
      * sent with every request rather than requiring it to be requested manually
-     * 
+     *
      * For servers this results in accepting the first set of extension settings
      * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With 
+     * requiring the extension to be manually negotiated in `validate`. With
      * auto-negotiate on, you may still override the auto-negotiate manually if
      * needed.
      */
diff --git a/websocketpp/config/debug.hpp b/websocketpp/config/debug.hpp
index f1f8da3089..0f2fc65c89 100644
--- a/websocketpp/config/debug.hpp
+++ b/websocketpp/config/debug.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_DEBUG_HPP
@@ -67,130 +67,130 @@ namespace config {
 /// Client/Server debug config with iostream transport
 struct debug_core {
     typedef debug_core type;
-    
+
     // Concurrency policy
     typedef websocketpp::concurrency::basic concurrency_type;
-    
+
     // HTTP Parser Policies
     typedef http::parser::request request_type;
     typedef http::parser::response response_type;
 
     // Message Policies
-    typedef message_buffer::message<message_buffer::alloc::con_msg_manager> 
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
         message_type;
-    typedef message_buffer::alloc::con_msg_manager<message_type> 
+    typedef message_buffer::alloc::con_msg_manager<message_type>
         con_msg_manager_type;
-    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type> 
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
         endpoint_msg_manager_type;
-    
+
     /// Logging policies
     typedef websocketpp::log::basic<concurrency_type,
         websocketpp::log::elevel> elog_type;
     typedef websocketpp::log::basic<concurrency_type,
         websocketpp::log::alevel> alog_type;
-    
+
     /// RNG policies
     typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
-    
+
     struct transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::elog_type elog_type;
         typedef type::alog_type alog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        
+
         /// Default timer values (in ms)
-                
+
         /// Length of time to wait for socket pre-initialization
         /**
          * Exactly what this includes depends on the socket policy in use
          */
         static const long timeout_socket_pre_init = 5000;
-        
+
         /// Length of time to wait before a proxy handshake is aborted
         static const long timeout_proxy = 5000;
-        
+
         /// Length of time to wait for socket post-initialization
         /**
          * Exactly what this includes depends on the socket policy in use.
          * Often this means the TLS handshake
          */
         static const long timeout_socket_post_init = 5000;
-        
+
         /// Length of time to wait for dns resolution
         static const long timeout_dns_resolve = 5000;
-        
+
         /// Length of time to wait for TCP connect
         static const long timeout_connect = 5000;
-        
+
         /// Length of time to wait for socket shutdown
         static const long timeout_socket_shutdown = 5000;
     };
 
     /// Transport Endpoint Component
-    typedef websocketpp::transport::iostream::endpoint<transport_config> 
+    typedef websocketpp::transport::iostream::endpoint<transport_config>
         transport_type;
-    
+
     /// User overridable Endpoint base class
     typedef websocketpp::endpoint_base endpoint_base;
     /// User overridable Connection base class
     typedef websocketpp::connection_base connection_base;
-    
+
     /// Default timer values (in ms)
-    
+
     /// Length of time before an opening handshake is aborted
     static const long timeout_open_handshake = 5000;
     /// Length of time before a closing handshake is aborted
     static const long timeout_close_handshake = 5000;
     /// Length of time to wait for a pong after a ping
     static const long timeout_pong = 5000;
-    
+
     /// WebSocket Protocol version to use as a client
     /**
-     * What version of the WebSocket Protocol to use for outgoing client 
+     * What version of the WebSocket Protocol to use for outgoing client
      * connections. Setting this to a value other than 13 (RFC6455) is not
      * recommended.
-     */ 
+     */
     static const int client_version = 13; // RFC6455
-    
+
     /// Default static error logging channels
     /**
      * Which error logging channels to enable at compile time. Channels not
      * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely 
-     * code to test whether or not to print out log messages on a certain 
-     * channel 
-     * 
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
      * Default is all except for development/debug level errors
-     */ 
-    static const websocketpp::log::level elog_level = 
+     */
+    static const websocketpp::log::level elog_level =
         websocketpp::log::elevel::all;
-        
+
     /// Default static access logging channels
     /**
      * Which access logging channels to enable at compile time. Channels not
      * enabled here will be unable to be selected by programs using the library.
-     * This option gives an optimizing compiler the ability to remove entirely 
-     * code to test whether or not to print out log messages on a certain 
-     * channel 
-     * 
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
      * Default is all except for development/debug level access messages
-     */ 
-    static const websocketpp::log::level alog_level = 
+     */
+    static const websocketpp::log::level alog_level =
         websocketpp::log::alevel::all;
-    
-    /// 
+
+    ///
     static const size_t connection_read_buffer_size = 512;
-    
-    /// Drop connections immediately on protocol error. 
-    /** 
+
+    /// Drop connections immediately on protocol error.
+    /**
      * Drop connections on protocol error rather than sending a close frame.
      * Off by default. This may result in legit messages near the error being
-     * dropped as well. It may free up resources otherwise spent dealing with 
+     * dropped as well. It may free up resources otherwise spent dealing with
      * misbehaving clients.
      */
     static const bool drop_on_protocol_error = false;
-    
+
     /// Suppresses the return of detailed connection close information
     /**
      * Silence close suppresses the return of detailed connection close
@@ -205,20 +205,20 @@ struct debug_core {
      * sent by local applications.
      */
     static const bool silent_close = false;
-    
+
     /// Global flag for enabling/disabling extensions
     static const bool enable_extensions = true;
-    
+
     /// Extension specific settings:
 
     /// permessage_compress extension
     struct permessage_deflate_config {
         typedef type::request_type request_type;
-        
+
         /// If the remote endpoint requests that we reset the compression
         /// context after each message should we honor the request?
         static const bool allow_disabling_context_takeover = true;
-        
+
         /// If the remote endpoint requests that we reduce the size of the
         /// LZ77 sliding window size this is the lowest value that will be
         /// allowed. Values range from 8 to 15. A value of 8 means we will
@@ -232,14 +232,14 @@ struct debug_core {
 
     /// Autonegotiate permessage-deflate
     /**
-     * Automatically enables the permessage-deflate extension. 
+     * Automatically enables the permessage-deflate extension.
      *
      * For clients this results in a permessage-deflate extension request being
      * sent with every request rather than requiring it to be requested manually
-     * 
+     *
      * For servers this results in accepting the first set of extension settings
      * requested by the client that we understand being used. The alternative is
-     * requiring the extension to be manually negotiated in `validate`. With 
+     * requiring the extension to be manually negotiated in `validate`. With
      * auto-negotiate on, you may still override the auto-negotiate manually if
      * needed.
      */
diff --git a/websocketpp/config/debug_asio.hpp b/websocketpp/config/debug_asio.hpp
index becf5480f2..66a65fdde6 100644
--- a/websocketpp/config/debug_asio.hpp
+++ b/websocketpp/config/debug_asio.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
@@ -43,19 +43,19 @@ namespace config {
 struct debug_asio_tls : public debug_core {
     typedef debug_asio_tls type;
     typedef debug_core base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
 
     struct transport_config : public base::transport_config {
@@ -67,7 +67,7 @@ struct debug_asio_tls : public debug_core {
         typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
 };
 
diff --git a/websocketpp/config/debug_asio_no_tls.hpp b/websocketpp/config/debug_asio_no_tls.hpp
index d9aec66c12..7437650aee 100644
--- a/websocketpp/config/debug_asio_no_tls.hpp
+++ b/websocketpp/config/debug_asio_no_tls.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
@@ -38,32 +38,32 @@ namespace config {
 struct debug_asio : public debug_core {
     typedef debug_asio type;
     typedef debug_core base;
-    
+
     typedef base::concurrency_type concurrency_type;
-    
+
     typedef base::request_type request_type;
     typedef base::response_type response_type;
 
     typedef base::message_type message_type;
     typedef base::con_msg_manager_type con_msg_manager_type;
     typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
+
     typedef base::alog_type alog_type;
     typedef base::elog_type elog_type;
-    
+
     typedef base::rng_type rng_type;
-    
+
     struct transport_config : public base::transport_config {
         typedef type::concurrency_type concurrency_type;
         typedef type::alog_type alog_type;
         typedef type::elog_type elog_type;
         typedef type::request_type request_type;
         typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
+        typedef websocketpp::transport::asio::basic_socket::endpoint
             socket_type;
     };
 
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
+    typedef websocketpp::transport::asio::endpoint<transport_config>
         transport_type;
 };
 
diff --git a/websocketpp/connection.hpp b/websocketpp/connection.hpp
index 92aa4d848d..efda6a2d9b 100644
--- a/websocketpp/connection.hpp
+++ b/websocketpp/connection.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONNECTION_HPP
@@ -49,17 +49,17 @@ namespace websocketpp {
 
 /// The type and function signature of an open handler
 /**
- * The open handler is called once for every successful WebSocket connection 
+ * The open handler is called once for every successful WebSocket connection
  * attempt. Either the fail handler or the open handler will be called for each
- * WebSocket connection attempt. HTTP Connections that did not attempt to 
- * upgrade the connection to the WebSocket protocol will trigger the http 
+ * WebSocket connection attempt. HTTP Connections that did not attempt to
+ * upgrade the connection to the WebSocket protocol will trigger the http
  * handler instead of fail/open.
  */
 typedef lib::function<void(connection_hdl)> open_handler;
 
 /// The type and function signature of a close handler
 /**
- * The close handler is called once for every successfully established 
+ * The close handler is called once for every successfully established
  * connection after it is no longer capable of sending or receiving new messages
  *
  * The close handler will be called exactly once for every connection for which
@@ -69,17 +69,17 @@ typedef lib::function<void(connection_hdl)> close_handler;
 
 /// The type and function signature of a fail handler
 /**
- * The fail handler is called once for every unsuccessful WebSocket connection 
+ * The fail handler is called once for every unsuccessful WebSocket connection
  * attempt. Either the fail handler or the open handler will be called for each
- * WebSocket connection attempt. HTTP Connections that did not attempt to 
- * upgrade the connection to the WebSocket protocol will trigger the http 
+ * WebSocket connection attempt. HTTP Connections that did not attempt to
+ * upgrade the connection to the WebSocket protocol will trigger the http
  * handler instead of fail/open.
  */
 typedef lib::function<void(connection_hdl)> fail_handler;
 
 /// The type and function signature of an interrupt handler
 /**
- * The interrupt handler is called when a connection receives an interrupt 
+ * The interrupt handler is called when a connection receives an interrupt
  * request from the application. Interrupts allow the application to trigger a
  * handler to be run in the absense of a WebSocket level handler trigger (like
  * a new message).
@@ -93,7 +93,7 @@ typedef lib::function<void(connection_hdl)> interrupt_handler;
 /**
  * The ping handler is called when the connection receives a WebSocket ping
  * control frame. The string argument contains the ping payload. The payload is
- * a binary string up to 126 bytes in length. The ping handler returns a bool, 
+ * a binary string up to 126 bytes in length. The ping handler returns a bool,
  * true if a pong response should be sent, false if the pong response should be
  * suppressed.
  */
@@ -117,11 +117,11 @@ typedef lib::function<void(connection_hdl,std::string)> pong_timeout_handler;
 /// The type and function signature of a validate handler
 /**
  * The validate handler is called after a WebSocket handshake has been received
- * and processed but before it has been accepted. This gives the application a 
- * chance to impliment connection details specific policies for accepting 
+ * and processed but before it has been accepted. This gives the application a
+ * chance to impliment connection details specific policies for accepting
  * connections and the ability to negotiate extensions and subprotocols.
- * 
- * The validate handler return value indicates whether or not the connection 
+ *
+ * The validate handler return value indicates whether or not the connection
  * should be accepted. Additional methods may be called during the function to
  * set response headers, set HTTP return/error codes, etc.
  */
@@ -132,19 +132,19 @@ typedef lib::function<bool(connection_hdl)> validate_handler;
  * The http handler is called when an HTTP connection is made that does not
  * attempt to upgrade the connection to the WebSocket protocol. This allows
  * WebSocket++ servers to respond to these requests with regular HTTP responses.
- * 
- * This can be used to deliver error pages & dashboards and to deliver static 
- * files such as the base HTML & JavaScript for an otherwise single page 
+ *
+ * This can be used to deliver error pages & dashboards and to deliver static
+ * files such as the base HTML & JavaScript for an otherwise single page
  * WebSocket application.
  *
  * Note: WebSocket++ is designed to be a high performance WebSocket server. It
  * is not tuned to provide a full featured, high performance, HTTP web server
  * solution. The HTTP handler is appropriate only for low volume HTTP traffic.
- * If you expect to serve high volumes of HTTP traffic a dedicated HTTP web 
+ * If you expect to serve high volumes of HTTP traffic a dedicated HTTP web
  * server is strongly recommended.
  *
  * The default HTTP handler will return a 426 Upgrade Required error. Custom
- * handlers may override the response status code to deliver any type of 
+ * handlers may override the response status code to deliver any type of
  * response.
  */
 typedef lib::function<void(connection_hdl)> http_handler;
@@ -194,10 +194,10 @@ namespace status {
 } // namespace fail
 
 namespace internal_state {
-    // More granular internal states. These are used for multi-threaded 
+    // More granular internal states. These are used for multi-threaded
     // connection synchronization and preventing values that are not yet or no
     // longer available from being used.
-    
+
     enum value {
         USER_INIT = 0,
         TRANSPORT_INIT = 1,
@@ -225,7 +225,7 @@ public:
     typedef lib::shared_ptr<type> ptr;
     /// Type of a weak pointer to this connection
     typedef lib::weak_ptr<type> weak_ptr;
-    
+
     /// Type of the concurrency component of this connection
     typedef typename config::concurrency_type concurrency_type;
     /// Type of the access logging policy
@@ -234,37 +234,37 @@ public:
     typedef typename config::elog_type elog_type;
 
     /// Type of the transport component of this connection
-    typedef typename config::transport_type::transport_con_type 
+    typedef typename config::transport_type::transport_con_type
         transport_con_type;
     /// Type of a shared pointer to the transport component of this connection
     typedef typename transport_con_type::ptr transport_con_ptr;
 
     typedef lib::function<void(ptr)> termination_handler;
-    
+
     typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
     typedef typename concurrency_type::mutex_type mutex_type;
-    
+
     typedef typename config::request_type request_type;
     typedef typename config::response_type response_type;
-    
+
     typedef typename config::message_type message_type;
     typedef typename message_type::ptr message_ptr;
-    
+
     typedef typename config::con_msg_manager_type con_msg_manager_type;
     typedef typename con_msg_manager_type::ptr con_msg_manager_ptr;
-    
+
     /// Type of RNG
     typedef typename config::rng_type rng_type;
-    
+
     typedef processor::processor<config> processor_type;
     typedef lib::shared_ptr<processor_type> processor_ptr;
-    
+
     // Message handler (needs to know message type)
     typedef lib::function<void(connection_hdl,message_ptr)> message_handler;
-    
+
     /// Type of a pointer to a transport timer handle
     typedef typename transport_con_type::timer_ptr timer_ptr;
-    
+
     // Misc Convenience Types
     typedef session::internal_state::value istate_type;
 
@@ -276,7 +276,7 @@ private:
     };
 public:
 
-    explicit connection(bool is_server, std::string const & ua, alog_type& alog, 
+    explicit connection(bool is_server, std::string const & ua, alog_type& alog,
         elog_type& elog, rng_type & rng)
       : transport_con_type(is_server,alog,elog)
       , m_user_agent(ua)
@@ -295,11 +295,11 @@ public:
     {
         m_alog.write(log::alevel::devel,"connection constructor");
     }
-    
+
     ///////////////////////////
     // Set Handler Callbacks //
     ///////////////////////////
-    
+
     /// Set open handler
     /**
      * The open handler is called after the WebSocket handshake is complete and
@@ -320,10 +320,10 @@ public:
     void set_close_handler(close_handler h) {
         m_close_handler = h;
     }
-    
+
     /// Set fail handler
     /**
-     * The fail handler is called whenever the connection fails while the 
+     * The fail handler is called whenever the connection fails while the
      * handshake is bring processed.
      *
      * @param h The new fail_handler
@@ -334,7 +334,7 @@ public:
 
     /// Set ping handler
     /**
-     * The ping handler is called whenever the connection receives a ping 
+     * The ping handler is called whenever the connection receives a ping
      * control frame. The ping payload is included.
      *
      * The ping handler's return time controls whether or not a pong is
@@ -346,7 +346,7 @@ public:
     void set_ping_handler(ping_handler h) {
         m_ping_handler = h;
     }
-    
+
     /// Set pong handler
     /**
      * The pong handler is called whenever the connection receives a pong
@@ -357,22 +357,22 @@ public:
     void set_pong_handler(pong_handler h) {
         m_pong_handler = h;
     }
-    
+
     /// Set pong timeout handler
     /**
-     * If the transport component being used supports timers, the pong timeout 
+     * If the transport component being used supports timers, the pong timeout
      * handler is called whenever a pong control frame is not received with the
      * configured timeout period after the application sends a ping.
-     * 
-     * The config setting `timeout_pong` controls the length of the timeout 
+     *
+     * The config setting `timeout_pong` controls the length of the timeout
      * period. It is specified in milliseconds.
-     * 
-     * This can be used to probe the health of the remote endpoint's WebSocket 
-     * implementation. This does not guarantee that the remote application 
+     *
+     * This can be used to probe the health of the remote endpoint's WebSocket
+     * implementation. This does not guarantee that the remote application
      * itself is still healthy but can be a useful diagnostic.
      *
-     * Note: receipt of this callback doesn't mean the pong will never come. 
-     * This functionality will not suppress delivery of the pong in question 
+     * Note: receipt of this callback doesn't mean the pong will never come.
+     * This functionality will not suppress delivery of the pong in question
      * should it arrive after the timeout.
      *
      * @param h The new pong_timeout_handler
@@ -380,7 +380,7 @@ public:
     void set_pong_timeout_handler(pong_timeout_handler h) {
         m_pong_timeout_handler = h;
     }
-    
+
     /// Set interrupt handler
     /**
      * The interrupt handler is called whenever the connection is manually
@@ -396,8 +396,8 @@ public:
     /**
      * The http handler is called after an HTTP request other than a WebSocket
      * upgrade request is received. It allows a WebSocket++ server to respond
-     * to regular HTTP requests on the same port as it processes WebSocket 
-     * connections. This can be useful for hosting error messages, flash 
+     * to regular HTTP requests on the same port as it processes WebSocket
+     * connections. This can be useful for hosting error messages, flash
      * policy files, status pages, and other simple HTTP responses. It is not
      * intended to be used as a primary web server.
      *
@@ -406,10 +406,10 @@ public:
     void set_http_handler(http_handler h) {
         m_http_handler = h;
     }
-    
+
     /// Set validate handler
     /**
-     * The validate handler is called after a WebSocket handshake has been 
+     * The validate handler is called after a WebSocket handshake has been
      * parsed but before a response is returned. It provides the application
      * a chance to examine the request and determine whether or not it wants
      * to accept the connection.
@@ -422,7 +422,7 @@ public:
     void set_validate_handler(validate_handler h) {
         m_validate_handler = h;
     }
-    
+
     /// Set message handler
     /**
      * The message handler is called after a new message has been received.
@@ -432,16 +432,16 @@ public:
     void set_message_handler(message_handler h) {
         m_message_handler = h;
     }
-    
+
     //////////////////////////////////
     // Uncategorized public methods //
     //////////////////////////////////
-    
+
     /// Get the size of the outgoing write buffer (in payload bytes)
     /**
      * Retrieves the number of bytes in the outgoing write buffer that have not
      * already been dispatched to the transport layer. This represents the bytes
-     * that are presently cancelable without uncleanly ending the websocket 
+     * that are presently cancelable without uncleanly ending the websocket
      * connection
      *
      * This method invokes the m_write_lock mutex
@@ -454,29 +454,29 @@ public:
     size_t buffered_amount() const {
         return get_buffered_amount();
     }
-    
+
     ////////////////////
     // Action Methods //
     ////////////////////
-    
+
     /// Create a message and then add it to the outgoing send queue
     /**
-     * Convenience method to send a message given a payload string and 
+     * Convenience method to send a message given a payload string and
      * optionally an opcode. Default opcode is utf8 text.
      *
      * This method locks the m_write_lock mutex
      *
      * @param payload The payload string to generated the message with
      *
-     * @param op The opcode to generated the message with. Default is 
+     * @param op The opcode to generated the message with. Default is
      * frame::opcode::text
      */
-    lib::error_code send(std::string const & payload, frame::opcode::value op = 
+    lib::error_code send(std::string const & payload, frame::opcode::value op =
         frame::opcode::TEXT);
-        
+
     /// Send a message (raw array overload)
     /**
-     * Convenience method to send a message given a raw array and optionally an 
+     * Convenience method to send a message given a raw array and optionally an
      * opcode. Default opcode is binary.
      *
      * This method locks the m_write_lock mutex
@@ -485,15 +485,15 @@ public:
      *
      * @param len Length of the array.
      *
-     * @param op The opcode to generated the message with. Default is 
+     * @param op The opcode to generated the message with. Default is
      * frame::opcode::binary
      */
-    lib::error_code send(void const * payload, size_t len, frame::opcode::value 
+    lib::error_code send(void const * payload, size_t len, frame::opcode::value
         op = frame::opcode::BINARY);
 
     /// Add a message to the outgoing send queue
     /**
-     * If presented with a prepared message it is added without validation or 
+     * If presented with a prepared message it is added without validation or
      * framing. If presented with an unprepared message it is validated, framed,
      * and then added
      *
@@ -514,22 +514,22 @@ public:
      * When the on_inturrupt handler callback is called it will be from
      * within the transport event loop with all the thread safety features
      * guaranteed by the transport to regular handlers
-     * 
+     *
      * Multiple inturrupt signals can be active at once on the same connection
      *
      * @return An error code
      */
     lib::error_code interrupt();
-    
+
     /// Transport inturrupt callback
     void handle_interrupt();
-    
+
     /// Send a ping
     /**
      * Initiates a ping with the given payload/
      *
      * There is no feedback directly from ping except in cases of immediately
-     * detectable errors. Feedback will be provided via on_pong or 
+     * detectable errors. Feedback will be provided via on_pong or
      * on_pong_timeout callbacks.
      *
      * Ping locks the m_write_lock mutex
@@ -537,13 +537,13 @@ public:
      * @param payload Payload to be used for the ping
      */
     void ping(std::string const & payload);
-    
+
     /// exception free variant of ping
     void ping(std::string const & payload, lib::error_code & ec);
-    
+
     /// Utility method that gets called back when the ping timer expires
     void handle_pong_timeout(std::string payload, lib::error_code const & ec);
-    
+
     /// Send a pong
     /**
      * Initiates a pong with the given payload.
@@ -558,11 +558,11 @@ public:
 
     /// exception free variant of pong
     void pong(std::string const & payload, lib::error_code & ec);
-    
+
     /// Close the connection
     /**
      * Initiates the close handshake process.
-     * 
+     *
      * If close returns successfully the connection will be in the closing
      * state and no additional messages may be sent. All messages sent prior
      * to calling close will be written out before the connection is closed.
@@ -572,7 +572,7 @@ public:
      *
      * The handler's on_close callback will be called once the close handshake
      * is complete.
-     * 
+     *
      * Reasons will be automatically truncated to the maximum length (123 bytes)
      * if necessary.
      *
@@ -580,51 +580,51 @@ public:
      * @param reason The close reason to send
      */
     void close(close::status::value const code, std::string const & reason);
-    
+
     /// exception free variant of close
-    void close(close::status::value const code, std::string const & reason, 
+    void close(close::status::value const code, std::string const & reason,
         lib::error_code & ec);
-    
+
     ////////////////////////////////////////////////
     // Pass-through access to the uri information //
     ////////////////////////////////////////////////
-    
+
     /// Returns the secure flag from the connection URI
     /**
-     * This value is available after the HTTP request has been fully read and 
+     * This value is available after the HTTP request has been fully read and
      * may be called from any thread.
      *
      * @return Whether or not the connection URI is flagged secure.
      */
     bool get_secure() const;
-    
+
     /// Returns the host component of the connection URI
     /**
-     * This value is available after the HTTP request has been fully read and 
+     * This value is available after the HTTP request has been fully read and
      * may be called from any thread.
      *
      * @return The host component of the connection URI
      */
     std::string const & get_host() const;
-    
+
     /// Returns the resource component of the connection URI
     /**
-     * This value is available after the HTTP request has been fully read and 
+     * This value is available after the HTTP request has been fully read and
      * may be called from any thread.
      *
      * @return The resource component of the connection URI
      */
     std::string const & get_resource() const;
-    
+
     /// Returns the port component of the connection URI
     /**
-     * This value is available after the HTTP request has been fully read and 
+     * This value is available after the HTTP request has been fully read and
      * may be called from any thread.
      *
      * @return The port component of the connection URI
      */
     uint16_t get_port() const;
-    
+
     /// Gets the connection URI
     /**
      * This should really only be called by internal library methods unless you
@@ -633,7 +633,7 @@ public:
      * @return A pointer to the connection's URI
      */
     uri_ptr get_uri() const;
-    
+
     /// Sets the connection URI
     /**
      * This should really only be called by internal library methods unless you
@@ -642,11 +642,11 @@ public:
      * @param uri The new URI to set
      */
     void set_uri(uri_ptr uri);
-    
+
     /////////////////////////////
     // Subprotocol negotiation //
     /////////////////////////////
-    
+
     /// Gets the negotated subprotocol
     /**
      * Retrieves the subprotocol that was negotiated during the handshake. This
@@ -655,7 +655,7 @@ public:
      * @return The negotiated subprotocol
      */
     std::string const & get_subprotocol() const;
-    
+
     /// Gets all of the subprotocols requested by the client
     /**
      * Retrieves the subprotocols that were requested during the handshake. This
@@ -664,13 +664,13 @@ public:
      * @return A vector of the requested subprotocol
      */
     std::vector<std::string> const & get_requested_subprotocols() const;
-    
+
     /// Adds the given subprotocol string to the request list (exception free)
     /**
-     * Adds a subprotocol to the list to send with the opening handshake. This 
-     * may be called multiple times to request more than one. If the server 
+     * Adds a subprotocol to the list to send with the opening handshake. This
+     * may be called multiple times to request more than one. If the server
      * supports one of these, it may choose one. If so, it will return it
-     * in it's handshake reponse and the value will be available via 
+     * in it's handshake reponse and the value will be available via
      * get_subprotocol(). Subprotocol requests should be added in order of
      * preference.
      *
@@ -679,23 +679,23 @@ public:
      * errors
      */
     void add_subprotocol(std::string const & request, lib::error_code & ec);
-    
+
     /// Adds the given subprotocol string to the request list
     /**
-     * Adds a subprotocol to the list to send with the opening handshake. This 
-     * may be called multiple times to request more than one. If the server 
+     * Adds a subprotocol to the list to send with the opening handshake. This
+     * may be called multiple times to request more than one. If the server
      * supports one of these, it may choose one. If so, it will return it
-     * in it's handshake reponse and the value will be available via 
+     * in it's handshake reponse and the value will be available via
      * get_subprotocol(). Subprotocol requests should be added in order of
      * preference.
      *
      * @param request The subprotocol to request
      */
     void add_subprotocol(std::string const & request);
-    
+
     /// Select a subprotocol to use (exception free)
     /**
-     * Indicates which subprotocol should be used for this connection. Valid 
+     * Indicates which subprotocol should be used for this connection. Valid
      * only during the validate handler callback. Subprotocol selected must have
      * been requested by the client. Consult get_requested_subprotocols() for a
      * list of valid subprotocols.
@@ -707,10 +707,10 @@ public:
      * errors
      */
     void select_subprotocol(std::string const & value, lib::error_code & ec);
-    
+
     /// Select a subprotocol to use
     /**
-     * Indicates which subprotocol should be used for this connection. Valid 
+     * Indicates which subprotocol should be used for this connection. Valid
      * only during the validate handler callback. Subprotocol selected must have
      * been requested by the client. Consult get_requested_subprotocols() for a
      * list of valid subprotocols.
@@ -720,45 +720,45 @@ public:
      * @param value The subprotocol to select
      */
     void select_subprotocol(std::string const & value);
-    
+
     /////////////////////////////////////////////////////////////
     // Pass-through access to the request and response objects //
     /////////////////////////////////////////////////////////////
-    
+
     /// Retrieve a request header
     /**
      * Retrieve the value of a header from the handshake HTTP request.
-     * 
+     *
      * @param key Name of the header to get
      * @return The value of the header
      */
     std::string const & get_request_header(std::string const & key);
-    
+
     /// Retrieve a response header
     /**
      * Retrieve the value of a header from the handshake HTTP request.
-     * 
+     *
      * @param key Name of the header to get
      * @return The value of the header
      */
     std::string const & get_response_header(std::string const & key);
-    
+
     /// Set response status code and message
     /**
      * Sets the response status code to `code` and looks up the corresponding
      * message for standard codes. Non-standard codes will be entered as Unknown
-     * use set_status(status_code::value,std::string) overload to set both 
+     * use set_status(status_code::value,std::string) overload to set both
      * values explicitly.
      *
      * This member function is valid only from the http() and validate() handler
      * callbacks
-     * 
+     *
      * @param code Code to set
      * @param msg Message to set
      * @see websocketpp::http::response::set_status
      */
     void set_status(http::status_code::value code);
-    
+
     /// Set response status code and message
     /**
      * Sets the response status code and message to independent custom values.
@@ -767,13 +767,13 @@ public:
      *
      * This member function is valid only from the http() and validate() handler
      * callbacks
-     * 
+     *
      * @param code Code to set
      * @param msg Message to set
      * @see websocketpp::http::response::set_status
      */
     void set_status(http::status_code::value code, std::string const & msg);
-    
+
     /// Set response body content
     /**
      * Set the body content of the HTTP response to the parameter string. Note
@@ -783,12 +783,12 @@ public:
      *
      * This member function is valid only from the http() and validate() handler
      * callbacks
-     * 
+     *
      * @param value String data to include as the body content.
      * @see websocketpp::http::response::set_body
      */
     void set_body(std::string const & value);
-    
+
     /// Append a header
     /**
      * If a header with this name already exists the value will be appended to
@@ -797,21 +797,21 @@ public:
      *
      * This member function is valid only from the http() and validate() handler
      * callbacks
-     * 
+     *
      * @param key Name of the header to set
      * @param val Value to add
      * @see replace_header
      * @see websocketpp::http::parser::append_header
      */
     void append_header(std::string const  &key, std::string const & val);
-    
+
     /// Replace a header
     /**
      * If a header with this name already exists the old value will be replaced
      * Use add_header to append to a list of existing values.
      *
      * This member function is valid only from the http() and validate() handler
-     * callbacks 
+     * callbacks
      *
      * @param key Name of the header to set
      * @param val Value to set
@@ -819,7 +819,7 @@ public:
      * @see websocketpp::http::parser::replace_header
      */
     void replace_header(std::string const & key, std::string const & val);
-    
+
     /// Remove a header
     /**
      * Removes a header from the response.
@@ -831,14 +831,14 @@ public:
      * @see websocketpp::http::parser::remove_header
      */
     void remove_header(std::string const & key);
-    
+
     /// Get request object
     /**
      * Direct access to request object. This can be used to call methods of the
-     * request object that are not part of the standard request API that 
+     * request object that are not part of the standard request API that
      * connection wraps.
      *
-     * Note use of this method involves using behavior specific to the 
+     * Note use of this method involves using behavior specific to the
      * configured HTTP policy. Such behavior may not work with alternate HTTP
      * policies.
      *
@@ -849,23 +849,23 @@ public:
     request_type const & get_request() const {
         return m_request;
     }
-    
+
     /////////////////////////////////////////////////////////////
     // Pass-through access to the other connection information //
     /////////////////////////////////////////////////////////////
-    
+
     /// Get Connection Handle
     /**
      * The connection handle is a token that can be shared outside the
      * WebSocket++ core for the purposes of identifying a connection and
      * sending it messages.
-     * 
+     *
      * @return A handle to the connection
      */
     connection_hdl get_handle() const {
         return m_connection_hdl;
     }
-    
+
     /// Get whether or not this connection is part of a server or client
     /**
      * @return whether or not the connection is attached to a server endpoint
@@ -873,16 +873,16 @@ public:
     bool is_server() const {
         return m_is_server;
     }
-    
+
     /// Return the same origin policy origin value from the opening request.
     /**
-     * This value is available after the HTTP request has been fully read and 
+     * This value is available after the HTTP request has been fully read and
      * may be called from any thread.
      *
      * @return The connection's origin value from the opening handshake.
      */
     std::string const & get_origin() const;
-    
+
     /// Return the connection state.
     /**
      * Values can be connecting, open, closing, and closed
@@ -890,8 +890,8 @@ public:
      * @return The connection's current state.
      */
     session::state::value get_state() const;
-    
-    
+
+
     /// Get the WebSocket close code sent by this endpoint.
     /**
      * @return The WebSocket close code sent by this endpoint.
@@ -899,7 +899,7 @@ public:
     close::status::value get_local_close_code() const {
         return m_local_close_code;
     }
-    
+
     /// Get the WebSocket close reason sent by this endpoint.
     /**
      * @return The WebSocket close reason sent by this endpoint.
@@ -907,7 +907,7 @@ public:
     std::string const & get_local_close_reason() const {
         return m_local_close_reason;
     }
-    
+
     /// Get the WebSocket close code sent by the remote endpoint.
     /**
      * @return The WebSocket close code sent by the remote endpoint.
@@ -915,7 +915,7 @@ public:
     close::status::value get_remote_close_code() const {
         return m_remote_close_code;
     }
-    
+
     /// Get the WebSocket close reason sent by the remote endpoint.
     /**
      * @return The WebSocket close reason sent by the remote endpoint.
@@ -923,30 +923,30 @@ public:
     std::string const & get_remote_close_reason() const {
         return m_remote_close_reason;
     }
-    
+
     /// Get the internal error code for a closed/failed connection
     /**
      * Retrieves a machine readable detailed error code indicating the reason
      * that the connection was closed or failed. Valid only after the close or
      * fail handler is called.
      *
-     * @return Error code indicating the reason the connection was closed or 
+     * @return Error code indicating the reason the connection was closed or
      * failed
      */
     lib::error_code get_ec() const {
         return m_ec;
     }
-    
+
     ////////////////////////////////////////////////////////////////////////
     // The remaining public member functions are for internal/policy use  //
     // only. Do not call from application code unless you understand what //
     // you are doing.                                                     //
     ////////////////////////////////////////////////////////////////////////
-    
+
     /// Set Connection Handle
     /**
-     * The connection handle is a token that can be shared outside the 
-     * WebSocket++ core for the purposes of identifying a connection and 
+     * The connection handle is a token that can be shared outside the
+     * WebSocket++ core for the purposes of identifying a connection and
      * sending it messages.
      *
      * @param hdl A connection_hdl that the connection will use to refer
@@ -956,52 +956,52 @@ public:
         m_connection_hdl = hdl;
         transport_con_type::set_handle(hdl);
     }
-    
+
     /// Get a message buffer
     /**
      * @internal
-     * 
+     *
      * Warning: This is not guaranteed to be part of the public release API
      *
-     * Message buffers are used to store message payloads and other message 
+     * Message buffers are used to store message payloads and other message
      * metadata.
-     * 
+     *
      * @return A new message.
      */
-    message_ptr get_message(websocketpp::frame::opcode::value op, size_t size) 
+    message_ptr get_message(websocketpp::frame::opcode::value op, size_t size)
         const
     {
         return m_msg_manager->get_message(op, size);
     }
-    
+
     void start();
-    
+
     void read_handshake(size_t num_bytes);
-    
+
     void handle_read_handshake(lib::error_code const & ec,
         size_t bytes_transferred);
     void handle_read_http_response(lib::error_code const & ec,
         size_t bytes_transferred);
-    
+
     void handle_send_http_response(lib::error_code const & ec);
     void handle_send_http_request(lib::error_code const & ec);
-    
+
     void handle_open_handshake_timeout(lib::error_code const & ec);
     void handle_close_handshake_timeout(lib::error_code const & ec);
-    
+
     void handle_read_frame(lib::error_code const & ec,
         size_t bytes_transferred);
-    
+
     /// Get array of WebSocket protocol versions that this connection supports.
     const std::vector<int>& get_supported_versions() const;
-    
-    /// Sets the handler for a terminating connection. Should only be used 
+
+    /// Sets the handler for a terminating connection. Should only be used
     /// internally by the endpoint class.
     void set_termination_handler(termination_handler new_handler);
-    
+
     void terminate(lib::error_code const & ec);
     void handle_terminate(terminate_status tstat, lib::error_code const & ec);
-    
+
     /// Checks if there are frames in the send queue and if there are sends one
     /**
      * \todo unit tests
@@ -1009,34 +1009,34 @@ public:
      * This method locks the m_write_lock mutex
      */
     void write_frame();
-    
+
     /// Process the results of a frame write operation and start the next write
     /**
      * \todo unit tests
      *
      * This method locks the m_write_lock mutex
      *
-     * @param terminate Whether or not to terminate the connection upon 
+     * @param terminate Whether or not to terminate the connection upon
      * completion of this write.
      *
-     * @param ec A status code from the transport layer, zero on success, 
+     * @param ec A status code from the transport layer, zero on success,
      * non-zero otherwise.
      */
     void handle_write_frame(bool terminate, lib::error_code const & ec);
 protected:
     void handle_transport_init(lib::error_code const & ec);
-    
-    /// Set m_processor based on information in m_request. Set m_response 
+
+    /// Set m_processor based on information in m_request. Set m_response
     /// status and return false on error.
     bool initialize_processor();
-    
-    /// Perform WebSocket handshake validation of m_request using m_processor. 
+
+    /// Perform WebSocket handshake validation of m_request using m_processor.
     /// set m_response and return false on error.
     bool process_handshake_request();
-    
+
     /// Atomically change the internal connection state.
     /**
-     * @param req The required starting state. If the internal state does not 
+     * @param req The required starting state. If the internal state does not
      * match req an exception is thrown.
      *
      * @param dest The state to change to.
@@ -1045,28 +1045,28 @@ protected:
      */
     void atomic_state_change(istate_type req, istate_type dest,
         std::string msg);
-    
+
     /// Atomically change the internal and external connection state.
     /**
-     * @param ireq The required starting internal state. If the internal state 
+     * @param ireq The required starting internal state. If the internal state
      * does not match ireq an exception is thrown.
      *
      * @param idest The internal state to change to.
      *
-     * @param ereq The required starting external state. If the external state 
+     * @param ereq The required starting external state. If the external state
      * does not match ereq an exception is thrown.
      *
      * @param edest The external state to change to.
      *
      * @param msg The message to include in the exception thrown
      */
-    void atomic_state_change(istate_type ireq, istate_type idest, 
-        session::state::value ereq, session::state::value edest, 
+    void atomic_state_change(istate_type ireq, istate_type idest,
+        session::state::value ereq, session::state::value edest,
         std::string msg);
-    
+
     /// Atomically read and compared the internal state.
     /**
-     * @param req The state to test against. If the internal state does not 
+     * @param req The state to test against. If the internal state does not
      * match req an exception is thrown.
      *
      * @param msg The message to include in the exception thrown
@@ -1075,10 +1075,10 @@ protected:
 private:
     /// Completes m_response, serializes it, and sends it out on the wire.
     void send_http_response();
-    
+
     /// Sends an opening WebSocket connect request
     void send_http_request();
-    
+
     /// Alternate path for send_http_response in error conditions
     void send_http_response_error();
 
@@ -1087,26 +1087,26 @@ private:
      *
      */
     void process_control_frame(message_ptr msg);
-   
+
     /// Send close acknowledgement
     /**
      * If no arguments are present no close code/reason will be specified.
      *
-     * Note: the close code/reason values provided here may be overrided by 
+     * Note: the close code/reason values provided here may be overrided by
      * other settings (such as silent close).
      *
      * @param code The close code to send
      * @param reason The close reason to send
      * @return A status code, zero on success, non-zero otherwise
      */
-    lib::error_code send_close_ack(close::status::value code = 
+    lib::error_code send_close_ack(close::status::value code =
         close::status::blank, std::string const & reason = "");
 
     /// Send close frame
     /**
      * If no arguments are present no close code/reason will be specified.
      *
-     * Note: the close code/reason values provided here may be overrided by 
+     * Note: the close code/reason values provided here may be overrided by
      * other settings (such as silent close).
      *
      * The ack flag determines what to do in the case of a blank status and
@@ -1117,22 +1117,22 @@ private:
      * @param ack Whether or not this is an acknowledgement close frame
      * @return A status code, zero on success, non-zero otherwise
      */
-    lib::error_code send_close_frame(close::status::value code = 
+    lib::error_code send_close_frame(close::status::value code =
         close::status::blank, std::string const & reason = "", bool ack = false,
         bool terminal = false);
 
     /// Get a pointer to a new WebSocket protocol processor for a given version
     /**
-     * @param version Version number of the WebSocket protocol to get a 
+     * @param version Version number of the WebSocket protocol to get a
      * processor for. Negative values indicate invalid/unknown versions and will
      * always return a null ptr
-     * 
-     * @return A shared_ptr to a new instance of the appropriate processor or a 
-     * null ptr if there is no installed processor that matches the version 
+     *
+     * @return A shared_ptr to a new instance of the appropriate processor or a
+     * null ptr if there is no installed processor that matches the version
      * number.
-     */ 
+     */
     processor_ptr get_processor(int version) const;
-   
+
     /// Add a message to the write queue
     /**
      * Adds a message to the write queue and updates any associated shared state
@@ -1147,7 +1147,7 @@ private:
 
     /// Pop a message from the write queue
     /**
-     * Removes and returns a message from the write queue and updates any 
+     * Removes and returns a message from the write queue and updates any
      * associated shared state.
      *
      * Must be called while holding m_write_lock
@@ -1157,7 +1157,7 @@ private:
      * @return the message_ptr at the front of the queue
      */
     message_ptr write_pop();
-    
+
     /// Prints information about the incoming connection to the access log
     /**
      * Prints information about the incoming connection to the access log.
@@ -1165,22 +1165,22 @@ private:
      * path, status code.
      */
     void log_open_result();
-    
+
     /// Prints information about a connection being closed to the access log
     /**
      * Includes: local and remote close codes and reasons
      */
     void log_close_result();
-    
+
     /// Prints information about a connection being failed to the access log
     /**
      * Includes: error code and message for why it was failed
      */
     void log_fail_result();
-    
+
     // static settings
     const std::string       m_user_agent;
-    
+
     /// Pointer to the connection handle
     connection_hdl          m_connection_hdl;
 
@@ -1212,7 +1212,7 @@ private:
 
     /// The lock used to protect the message queue
     /**
-     * Serializes access to the write queue as well as shared state within the 
+     * Serializes access to the write queue as well as shared state within the
      * processor.
      */
     mutex_type              m_write_lock;
@@ -1224,16 +1224,16 @@ private:
     con_msg_manager_ptr     m_msg_manager;
     timer_ptr               m_handshake_timer;
     timer_ptr               m_ping_timer;
-    
+
     /// @todo this is not memory efficient. this value is not used after the
     /// handshake.
     std::string m_handshake_buffer;
-    
+
     /// Pointer to the processor object for this connection
     /**
-     * The processor provides functionality that is specific to the WebSocket 
-     * protocol version that the client has negotiated. It also contains all of 
-     * the state necessary to encode and decode the incoming and outgoing 
+     * The processor provides functionality that is specific to the WebSocket
+     * protocol version that the client has negotiated. It also contains all of
+     * the state necessary to encode and decode the incoming and outgoing
      * WebSocket byte streams
      *
      * Use of the prepare_data_frame method requires lock: m_write_lock
@@ -1251,17 +1251,17 @@ private:
      * Lock: m_write_lock
      */
     size_t m_send_buffer_size;
-    
+
     /// buffer holding the various parts of the current message being writen
     /**
      * Lock m_write_lock
      */
     std::vector<transport::buffer> m_send_buffer;
-    
-    /// a pointer to hold on to the current message being written to keep it 
+
+    /// a pointer to hold on to the current message being written to keep it
     /// from going out of scope before the write is complete.
     message_ptr m_current_msg;
-    
+
     /// True if there is currently an outstanding transport write
     /**
      * Lock m_write_lock
@@ -1273,17 +1273,17 @@ private:
     response_type           m_response;
     uri_ptr                 m_uri;
     std::string             m_subprotocol;
-    
+
     // connection data that might not be necessary to keep around for the life
     // of the whole connection.
     std::vector<std::string> m_requested_subprotocols;
-    
+
     bool const              m_is_server;
     alog_type& m_alog;
     elog_type& m_elog;
-    
+
     rng_type & m_rng;
-    
+
     // Close state
     /// Close code that was sent on the wire by this endpoint
     close::status::value    m_local_close_code;
@@ -1296,15 +1296,15 @@ private:
 
     /// Close reason that was received on the wire from the remote endpoint
     std::string             m_remote_close_reason;
-    
+
     /// Detailed internal error code
     lib::error_code m_ec;
-    
+
     bool m_was_clean;
-    
+
     /// Whether or not this endpoint initiated the closing handshake.
     bool                    m_closed_by_me;
-    
+
     /// ???
     bool                    m_failed_by_me;
 
diff --git a/websocketpp/connection_base.hpp b/websocketpp/connection_base.hpp
index c65b6472bd..f780da7b90 100644
--- a/websocketpp/connection_base.hpp
+++ b/websocketpp/connection_base.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONNECTION_BASE_HPP
diff --git a/websocketpp/endpoint.hpp b/websocketpp/endpoint.hpp
index 36a0fd3f41..3d44aef463 100644
--- a/websocketpp/endpoint.hpp
+++ b/websocketpp/endpoint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ENDPOINT_HPP
@@ -44,7 +44,7 @@ public:
     // Import appropriate types from our helper class
     // See endpoint_types for more details.
     typedef endpoint<connection,config> type;
-    
+
     /// Type of the transport component of this endpoint
     typedef typename config::transport_type transport_type;
     /// Type of the concurrency component of this endpoint
@@ -56,35 +56,35 @@ public:
     typedef typename connection_type::ptr connection_ptr;
     /// Weak pointer to connection type
     typedef typename connection_type::weak_ptr connection_weak_ptr;
-    
-    /// Type of the transport component of the connections that this endpoint 
+
+    /// Type of the transport component of the connections that this endpoint
     /// creates
     typedef typename transport_type::transport_con_type transport_con_type;
     /// Type of a shared pointer to the transport component of the connections
     /// that this endpoint creates.
     typedef typename transport_con_type::ptr transport_con_ptr;
-    
+
     /// Type of message_handler
     typedef typename connection_type::message_handler message_handler;
     /// Type of message pointers that this endpoint uses
     typedef typename connection_type::message_ptr message_ptr;
-    
+
     /// Type of error logger
     typedef typename config::elog_type elog_type;
     /// Type of access logger
     typedef typename config::alog_type alog_type;
-    
+
     /// Type of our concurrency policy's scoped lock object
     typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
     /// Type of our concurrency policy's mutex object
     typedef typename concurrency_type::mutex_type mutex_type;
-    
+
     /// Type of RNG
     typedef typename config::rng_type rng_type;
-    
+
     // TODO: organize these
     typedef typename connection_type::termination_handler termination_handler;
-    
+
     typedef lib::shared_ptr<connection_weak_ptr> hdl_type;
 
     explicit endpoint(bool is_server)
@@ -95,53 +95,53 @@ public:
     {
         m_alog.set_channels(config::alog_level);
         m_elog.set_channels(config::elog_level);
-        
+
         m_alog.write(log::alevel::devel,"endpoint constructor");
 
         transport_type::init_logging(&m_alog,&m_elog);
     }
-    
+
     /// Returns the user agent string that this endpoint will use
     /**
      * Returns the user agent string that this endpoint will use when creating
-     * new connections. 
+     * new connections.
      *
      * The default value for this version is stored in websocketpp::user_agent
      *
      * @return The user agent string.
-     */ 
+     */
     std::string get_user_agent() const {
         scoped_lock_type guard(m_mutex);
         return m_user_agent;
     }
-    
+
     /// Sets the user agent string that this endpoint will use
     /**
-     * Sets the identifier that this endpoint will use when creating new 
+     * Sets the identifier that this endpoint will use when creating new
      * connections. Changing this value will only affect future connections.
      * For client endpoints this will be sent as the "User-Agent" header in
      * outgoing requests. For server endpoints this will be sent in the "Server"
      * response header.
      *
      * Setting this value to the empty string will suppress the use of the
-     * Server and User-Agent headers. This is typically done to hide 
+     * Server and User-Agent headers. This is typically done to hide
      * implementation details for security purposes.
      *
      * For best results set this before accepting or opening connections.
      *
      * The default value for this version is stored in websocketpp::user_agent
      *
-     * This can be overridden on an individual connection basis by setting a 
-     * custom "Server" header during the validate handler or "User-Agent" 
+     * This can be overridden on an individual connection basis by setting a
+     * custom "Server" header during the validate handler or "User-Agent"
      * header on a connection before calling connect().
      *
      * @param ua The string to set the user agent to.
-     */ 
+     */
     void set_user_agent(std::string const & ua) {
         scoped_lock_type guard(m_mutex);
         m_user_agent = ua;
     }
-    
+
     /// Returns whether or not this endpoint is a server.
     /**
      * @return Whether or not this endpoint is a server
@@ -149,55 +149,55 @@ public:
     bool is_server() const {
         return m_is_server;
     }
-    
+
     /********************************/
     /* Pass-through logging adaptor */
     /********************************/
-    
+
     /// Set Access logging channel
     /**
      * Set the access logger's channel value. The value is a number whose
      * interpretation depends on the logging policy in use.
-     * 
+     *
      * @param channels The channel value(s) to set
      */
     void set_access_channels(log::level channels) {
         m_alog.set_channels(channels);
     }
-    
+
     /// Clear Access logging channels
     /**
      * Clear the access logger's channel value. The value is a number whose
      * interpretation depends on the logging policy in use.
-     * 
+     *
      * @param channels The channel value(s) to clear
      */
     void clear_access_channels(log::level channels) {
         m_alog.clear_channels(channels);
     }
-    
+
     /// Set Error logging channel
     /**
      * Set the error logger's channel value. The value is a number whose
      * interpretation depends on the logging policy in use.
-     * 
+     *
      * @param channels The channel value(s) to set
      */
     void set_error_channels(log::level channels) {
         m_elog.set_channels(channels);
     }
-    
+
     /// Clear Error logging channels
     /**
      * Clear the error logger's channel value. The value is a number whose
      * interpretation depends on the logging policy in use.
-     * 
+     *
      * @param channels The channel value(s) to clear
      */
     void clear_error_channels(log::level channels) {
         m_elog.clear_channels(channels);
     }
-    
+
     /// Get reference to access logger
     /**
      * @return A reference to the access logger
@@ -205,7 +205,7 @@ public:
     alog_type & get_alog() {
         return m_alog;
     }
-    
+
     /// Get reference to error logger
     /**
      * @return A reference to the error logger
@@ -213,7 +213,7 @@ public:
     elog_type & get_elog() {
         return m_elog;
     }
-    
+
     /*************************/
     /* Set Handler functions */
     /*************************/
@@ -261,27 +261,27 @@ public:
         scoped_lock_type guard(m_mutex);
         m_message_handler = h;
     }
-    
+
     /*************************************/
     /* Connection pass through functions */
     /*************************************/
-    
+
     /**
      * These functions act as adaptors to their counterparts in connection. They
      * can produce one additional type of error, the bad_connection error, that
-     * indicates that the conversion from connection_hdl to connection_ptr 
-     * failed due to the connection not existing anymore. Each method has a 
+     * indicates that the conversion from connection_hdl to connection_ptr
+     * failed due to the connection not existing anymore. Each method has a
      * default and an exception free varient.
      */
-    
+
     void interrupt(connection_hdl hdl, lib::error_code & ec);
     void interrupt(connection_hdl hdl);
 
-    void send(connection_hdl hdl, std::string const & payload, 
+    void send(connection_hdl hdl, std::string const & payload,
         frame::opcode::value op, lib::error_code & ec);
     void send(connection_hdl hdl, std::string const & payload,
         frame::opcode::value op);
-        
+
     void send(connection_hdl hdl, void const * payload, size_t len,
         frame::opcode::value op, lib::error_code & ec);
     void send(connection_hdl hdl, void const * payload, size_t len,
@@ -289,10 +289,10 @@ public:
 
     void send(connection_hdl hdl, message_ptr msg, lib::error_code & ec);
     void send(connection_hdl hdl, message_ptr msg);
-    
-    void close(connection_hdl hdl, close::status::value const code, 
+
+    void close(connection_hdl hdl, close::status::value const code,
         std::string const & reason, lib::error_code & ec);
-    void close(connection_hdl hdl, close::status::value const code, 
+    void close(connection_hdl hdl, close::status::value const code,
         std::string const & reason);
 
     /// Send a ping to a specific connection
@@ -303,7 +303,7 @@ public:
      * @param [in] payload The payload string to send.
      * @param [out] ec A reference to an error code to fill in
      */
-    void ping(connection_hdl hdl, std::string const & payload, 
+    void ping(connection_hdl hdl, std::string const & payload,
         lib::error_code & ec);
     /// Send a ping to a specific connection
     /**
@@ -324,7 +324,7 @@ public:
      * @param [in] payload The payload string to send.
      * @param [out] ec A reference to an error code to fill in
      */
-    void pong(connection_hdl hdl, std::string const & payload, 
+    void pong(connection_hdl hdl, std::string const & payload,
         lib::error_code & ec);
     /// Send a pong to a specific connection
     /**
@@ -336,14 +336,14 @@ public:
      * @param [in] payload The payload string to send.
      */
     void pong(connection_hdl hdl, std::string const & payload);
-        
+
     /// Retrieves a connection_ptr from a connection_hdl (exception free)
     /**
      * Converting a weak pointer to shared_ptr is not thread safe because the
      * pointer could be deleted at any time.
      *
      * NOTE: This method may be called by handler to upgrade its handle to a
-     * full connection_ptr. That full connection may then be used safely for the 
+     * full connection_ptr. That full connection may then be used safely for the
      * remainder of the handler body. get_con_from_hdl and the resulting
      * connection_ptr are NOT safe to use outside the handler loop.
      *
@@ -360,7 +360,7 @@ public:
         }
         return con;
     }
-    
+
     /// Retrieves a connection_ptr from a connection_hdl (exception version)
     connection_ptr get_con_from_hdl(connection_hdl hdl) {
         lib::error_code ec;
@@ -373,13 +373,13 @@ public:
 protected:
     connection_ptr create_connection();
     void remove_connection(connection_ptr con);
-    
+
     alog_type m_alog;
     elog_type m_elog;
 private:
     // dynamic settings
     std::string                 m_user_agent;
-    
+
     open_handler                m_open_handler;
     close_handler               m_close_handler;
     fail_handler                m_fail_handler;
@@ -390,15 +390,15 @@ private:
     http_handler                m_http_handler;
     validate_handler            m_validate_handler;
     message_handler             m_message_handler;
-    
+
     rng_type m_rng;
-    
+
     // endpoint resources
     std::set<connection_ptr>    m_connections;
-    
+
     // static settings
     bool const                  m_is_server;
-    
+
     // endpoint state
     mutex_type                  m_mutex;
 };
diff --git a/websocketpp/endpoint_base.hpp b/websocketpp/endpoint_base.hpp
index 3327112568..c6f26285bb 100644
--- a/websocketpp/endpoint_base.hpp
+++ b/websocketpp/endpoint_base.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ENDPOINT_BASE_HPP
diff --git a/websocketpp/error.hpp b/websocketpp/error.hpp
index 3125584af4..67edff8578 100644
--- a/websocketpp/error.hpp
+++ b/websocketpp/error.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ERROR_HPP
@@ -55,7 +55,7 @@ enum value {
     endpoint_not_secure,
 
     /// Attempted an operation that required an endpoint that is no longer
-    /// available. This is usually because the endpoint went out of scope 
+    /// available. This is usually because the endpoint went out of scope
     /// before a connection that it created.
     endpoint_unavailable,
 
@@ -64,52 +64,52 @@ enum value {
 
     /// The endpoint is out of outgoing message buffers
     no_outgoing_buffers,
-    
+
     /// The endpoint is out of incoming message buffers
     no_incoming_buffers,
 
     /// The connection was in the wrong state for this operation
     invalid_state,
-    
+
     /// Unable to parse close code
     bad_close_code,
-    
+
     /// Close code is in a reserved range
     reserved_close_code,
 
     /// Close code is invalid
     invalid_close_code,
-    
+
     /// Invalid UTF-8
     invalid_utf8,
-    
+
     /// Invalid subprotocol
     invalid_subprotocol,
-    
+
     /// Bad or unknown connection
     bad_connection,
-    
+
     /// Unit testing utility error code
     test,
-    
+
     /// Connection creation attempted failed
     con_creation_failed,
-    
+
     /// Selected subprotocol was not requested by the client
     unrequested_subprotocol,
-    
+
     /// Attempted to use a client specific feature on a server endpoint
     client_only,
-    
+
     /// Attempted to use a server specific feature on a client endpoint
     server_only,
-    
+
     /// HTTP connection ended
     http_connection_ended,
-    
+
     /// WebSocket opening handshake timed out
     open_handshake_timeout,
-    
+
     /// WebSocket close handshake timed out
     close_handshake_timeout,
 
@@ -125,7 +125,7 @@ public:
     const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
         return "websocketpp";
     }
-    
+
     std::string message(int value) const {
         switch(value) {
             case error::general:
@@ -204,20 +204,20 @@ _WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
 namespace websocketpp {
 
 class exception : public std::exception {
-public: 
+public:
     exception(const std::string& msg,
-              error::value code = error::general) 
+              error::value code = error::general)
     : m_msg(msg),m_code(code) {}
     ~exception() throw() {}
-    
+
     virtual const char* what() const throw() {
         return m_msg.c_str();
     }
-    
+
     error::value code() const throw() {
         return m_code;
     }
-    
+
     std::string m_msg;
     error::value m_code;
 };
diff --git a/websocketpp/error_container.hpp b/websocketpp/error_container.hpp
index 119c99e552..b7c75ac964 100644
--- a/websocketpp/error_container.hpp
+++ b/websocketpp/error_container.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ERROR_MESSAGE_HPP
@@ -39,22 +39,22 @@ public:
 	const std::string& get_msg() const {
 		return m_error_msg;
 	}
-	
+
 	void set_msg(const std::string& msg) {
 		m_error_msg = msg;
 	}
-	
+
 	void append_msg(const std::string& msg) {
 		m_error_msg.append(msg);
 	}
-	
+
 	template <typename T>
 	void set_msg(const T& thing) {
 		std::stringsteam val;
 		val << thing;
 		this->set_msg(val.str());
 	}
-	
+
 	template <typename T>
 	void append_msg(const T& thing) {
 		std::stringsteam val;
@@ -68,4 +68,4 @@ private:
 
 } // namespace websocketpp
 
-#endif // WEBSOCKETPP_ERROR_MESSAGE_HPP
\ No newline at end of file
+#endif // WEBSOCKETPP_ERROR_MESSAGE_HPP
diff --git a/websocketpp/extensions/extension.hpp b/websocketpp/extensions/extension.hpp
index 5f687f37ae..104ea704b6 100644
--- a/websocketpp/extensions/extension.hpp
+++ b/websocketpp/extensions/extension.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_EXTENSION_HPP
@@ -40,11 +40,11 @@ namespace websocketpp {
  * Some generic information about extensions
  *
  * Each extension object has an implemented flag. It can be retrieved by calling
- * is_implemented(). This compile time flag indicates whether or not the object 
+ * is_implemented(). This compile time flag indicates whether or not the object
  * in question actually implements the extension or if it is a placeholder stub
  *
- * Each extension object also has an enabled flag. It can be retrieved by 
- * calling is_enabled(). This runtime flag indicates whether or not the 
+ * Each extension object also has an enabled flag. It can be retrieved by
+ * calling is_enabled(). This runtime flag indicates whether or not the
  * extension has been negotiated for this connection.
  */
 namespace extensions {
diff --git a/websocketpp/extensions/permessage_deflate/disabled.hpp b/websocketpp/extensions/permessage_deflate/disabled.hpp
index 8b1e6cb57f..3a5da7fdcc 100644
--- a/websocketpp/extensions/permessage_deflate/disabled.hpp
+++ b/websocketpp/extensions/permessage_deflate/disabled.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
@@ -56,14 +56,14 @@ public:
     err_str_pair negotiate(http::attribute_list const & attributes) {
         return make_pair(make_error_code(error::disabled),std::string());
     }
-    
-    /// Returns true if the extension is capable of providing 
+
+    /// Returns true if the extension is capable of providing
     /// permessage_deflate functionality
     bool is_implemented() const {
         return false;
     }
-    
-    /// Returns true if permessage_deflate functionality is active for this 
+
+    /// Returns true if permessage_deflate functionality is active for this
     /// connection
     bool is_enabled() const {
         return false;
diff --git a/websocketpp/extensions/permessage_deflate/enabled.hpp b/websocketpp/extensions/permessage_deflate/enabled.hpp
index 7fdaef541c..092690c2f0 100644
--- a/websocketpp/extensions/permessage_deflate/enabled.hpp
+++ b/websocketpp/extensions/permessage_deflate/enabled.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
@@ -54,7 +54,7 @@ namespace extensions {
  *
  * **is_enabled**\n
  * `bool is_enabled()`\n
- * Returns whether or not the extension was negotiated for the current 
+ * Returns whether or not the extension was negotiated for the current
  * connection
  *
  * **generate_offer**\n
@@ -74,7 +74,7 @@ namespace extensions {
  * Compress the bytes in `in` and append them to `out`
  *
  * **decompress**\n
- * `lib::error_code decompress(uint8_t const * buf, size_t len, std::string & 
+ * `lib::error_code decompress(uint8_t const * buf, size_t len, std::string &
  * out)`\n
  * Decompress `len` bytes from `buf` and append them to string `out`
  */
@@ -97,7 +97,7 @@ enum value {
 
     /// Unsupported extension attributes
     unsupported_attributes,
-    
+
     /// Invalid value for max_window_bits
     invalid_max_window_bits,
 
@@ -193,12 +193,12 @@ enum value {
     /// Use the smallest value common to both offers
     smallest
 };
-} // namespace mode 
+} // namespace mode
 
 template <typename config>
 class enabled {
 public:
-    enabled() 
+    enabled()
       : m_enabled(false)
       , m_s2c_no_context_takeover(false)
       , m_c2s_no_context_takeover(false)
@@ -219,7 +219,7 @@ public:
         m_istate.avail_in = 0;
         m_istate.next_in = Z_NULL;
     }
-    
+
     ~enabled() {
         if (!m_initialized) {
             return;
@@ -228,18 +228,18 @@ public:
         int ret = deflateEnd(&m_dstate);
 
         if (ret != Z_OK) {
-            //std::cout << "error cleaning up zlib compression state" 
+            //std::cout << "error cleaning up zlib compression state"
             //          << std::endl;
         }
 
         ret = inflateEnd(&m_istate);
 
         if (ret != Z_OK) {
-            //std::cout << "error cleaning up zlib decompression state" 
+            //std::cout << "error cleaning up zlib decompression state"
             //          << std::endl;
         }
     }
-    
+
     /// Initialize zlib state
     /**
      *
@@ -279,7 +279,7 @@ public:
         if (ret != Z_OK) {
             return make_error_code(error::zlib_error);
         }
-        
+
         m_compress_buffer.reset(new unsigned char[m_compress_buffer_size]);
         m_initialized = true;
         return lib::error_code();
@@ -305,16 +305,16 @@ public:
     bool is_enabled() const {
         return m_enabled;
     }
-    
+
     /// Reset server's outgoing LZ77 sliding window for each new message
     /**
      * Enabling this setting will cause the server's compressor to reset the
-     * compression state (the LZ77 sliding window) for every message. This 
-     * means that the compressor will not look back to patterns in previous 
-     * messages to improve compression. This will reduce the compression 
+     * compression state (the LZ77 sliding window) for every message. This
+     * means that the compressor will not look back to patterns in previous
+     * messages to improve compression. This will reduce the compression
      * efficiency for large messages somewhat and small messages drastically.
      *
-     * This option may reduce server compressor memory usage and client 
+     * This option may reduce server compressor memory usage and client
      * decompressor memory usage.
      * @todo Document to what extent memory usage will be reduced
      *
@@ -334,12 +334,12 @@ public:
     /// Reset client's outgoing LZ77 sliding window for each new message
     /**
      * Enabling this setting will cause the client's compressor to reset the
-     * compression state (the LZ77 sliding window) for every message. This 
-     * means that the compressor will not look back to patterns in previous 
-     * messages to improve compression. This will reduce the compression 
+     * compression state (the LZ77 sliding window) for every message. This
+     * means that the compressor will not look back to patterns in previous
+     * messages to improve compression. This will reduce the compression
      * efficiency for large messages somewhat and small messages drastically.
      *
-     * This option may reduce client compressor memory usage and server 
+     * This option may reduce client compressor memory usage and server
      * decompressor memory usage.
      * @todo Document to what extent memory usage will be reduced
      *
@@ -354,7 +354,7 @@ public:
     /**
      * The bits setting is the base 2 logarithm of the maximum window size that
      * the server must use to compress outgoing messages. The permitted range
-     * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB 
+     * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB
      * window. The default setting is 15.
      *
      * Mode Options:
@@ -423,17 +423,17 @@ public:
     std::string generate_offer() const {
         return "";
     }
-    
+
     /// Validate extension response
     /**
-     * Confirm that the server has negotiated settings compatible with our 
+     * Confirm that the server has negotiated settings compatible with our
      * original offer and apply those settings to the extension state.
-     * 
+     *
      * @param response The server response attribute list to validate
      * @return Validation error or 0 on success
      */
     lib::error_code validate_offer(http::attribute_list const & response) {
-        
+
     }
 
     /// Negotiate extension
@@ -466,7 +466,7 @@ public:
                 break;
             }
         }
-        
+
         if (ret.first == lib::error_code()) {
             m_enabled = true;
             ret.second = generate_response();
@@ -498,7 +498,7 @@ public:
             m_dstate.next_out = m_compress_buffer.get();
 
             ret = deflate(&m_dstate, Z_SYNC_FLUSH);
-            
+
             output = m_compress_buffer_size - m_dstate.avail_out;
 
             out.append((char *)(m_compress_buffer.get()),output);
@@ -576,11 +576,11 @@ private:
     }
 
     /// Negotiate s2c_no_context_takeover attribute
-    /** 
+    /**
      * @param [in] value The value of the attribute from the offer
      * @param [out] ec A reference to the error code to return errors via
      */
-    void negotiate_s2c_no_context_takeover(std::string const & value, 
+    void negotiate_s2c_no_context_takeover(std::string const & value,
         lib::error_code & ec)
     {
         if (!value.empty()) {
@@ -592,11 +592,11 @@ private:
     }
 
     /// Negotiate c2s_no_context_takeover attribute
-    /** 
+    /**
      * @param [in] value The value of the attribute from the offer
      * @param [out] ec A reference to the error code to return errors via
      */
-    void negotiate_c2s_no_context_takeover(std::string const & value, 
+    void negotiate_c2s_no_context_takeover(std::string const & value,
         lib::error_code & ec)
     {
         if (!value.empty()) {
@@ -606,7 +606,7 @@ private:
 
         m_c2s_no_context_takeover = true;
     }
-    
+
     /// Negotiate s2c_max_window_bits attribute
     /**
      * When this method starts, m_s2c_max_window_bits will contain the server's
@@ -627,13 +627,13 @@ private:
         lib::error_code & ec)
     {
         uint8_t bits = uint8_t(atoi(value.c_str()));
-        
+
         if (bits < min_s2c_max_window_bits || bits > max_s2c_max_window_bits) {
             ec = make_error_code(error::invalid_attribute_value);
             m_s2c_max_window_bits = default_s2c_max_window_bits;
             return;
         }
-        
+
         switch (m_s2c_max_window_bits_mode) {
             case mode::decline:
                 m_s2c_max_window_bits = default_s2c_max_window_bits;
@@ -656,7 +656,7 @@ private:
     /// Negotiate c2s_max_window_bits attribute
     /**
      * When this method starts, m_c2s_max_window_bits and m_c2s_max_window_mode
-     * will contain the server's preferred values for window size and 
+     * will contain the server's preferred values for window size and
      * negotiation mode.
      *
      * options:
@@ -672,10 +672,10 @@ private:
             lib::error_code & ec)
     {
         uint8_t bits = uint8_t(atoi(value.c_str()));
-        
+
         if (value.empty()) {
             bits = default_c2s_max_window_bits;
-        } else if (bits < min_c2s_max_window_bits || 
+        } else if (bits < min_c2s_max_window_bits ||
                    bits > max_c2s_max_window_bits)
         {
             ec = make_error_code(error::invalid_attribute_value);
diff --git a/websocketpp/frame.hpp b/websocketpp/frame.hpp
index 0a09de5830..32b50a64fc 100644
--- a/websocketpp/frame.hpp
+++ b/websocketpp/frame.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_FRAME_HPP
@@ -38,7 +38,7 @@
 namespace websocketpp {
 /// Data structures and utility functions for manipulating WebSocket frames
 /**
- * namespace frame provides a number of data structures and utility functions 
+ * namespace frame provides a number of data structures and utility functions
  * for reading, writing, and manipulating binary encoded WebSocket frames.
  */
 namespace frame {
@@ -90,7 +90,7 @@ namespace opcode {
         control_rsvd = 0xD,
         control_rsve = 0xE,
         control_rsvf = 0xF,
-        
+
         CONTINUATION = 0x0,
         TEXT = 0x1,
         BINARY = 0x2,
@@ -115,14 +115,14 @@ namespace opcode {
      * @return Whether or not the opcode is reserved.
      */
     inline bool reserved(value v) {
-        return (v >= rsv3 && v <= rsv7) || 
+        return (v >= rsv3 && v <= rsv7) ||
                (v >= control_rsvb && v <= control_rsvf);
     }
 
     /// Check if an opcode is invalid
     /**
      * Invalid opcodes are negative or require greater than 4 bits to store.
-     * 
+     *
      * @param v The opcode to test.
      * @return Whether or not the opcode is invalid.
      */
@@ -150,19 +150,19 @@ namespace limits {
 
     /// Maximum length of the variable portion of the WebSocket header
     static unsigned int const max_extended_header_length = 12;
-    
+
     /// Maximum size of a basic WebSocket payload
     static uint8_t const payload_size_basic = 125;
-    
-    /// Maximum size of an extended WebSocket payload (basic payload = 126) 
+
+    /// Maximum size of an extended WebSocket payload (basic payload = 126)
     static uint16_t const payload_size_extended = 0xFFFF; // 2^16, 65535
-    
+
     /// Maximum size of a jumbo WebSocket payload (basic payload = 127)
     static uint64_t const payload_size_jumbo = 0x7FFFFFFFFFFFFFFFLL;//2^63
-    
+
     /// Maximum size of close frame reason
-    /** 
-     * This is payload_size_basic - 2 bytes (as first two bytes are used for 
+    /**
+     * This is payload_size_basic - 2 bytes (as first two bytes are used for
      * the close code
      */
     static uint8_t const close_reason_size = 123;
@@ -178,7 +178,7 @@ static uint8_t const BHB0_FIN = 0x80;
 
 static uint8_t const BHB1_PAYLOAD = 0x7F;
 static uint8_t const BHB1_MASK = 0x80;
-    
+
 static uint8_t const payload_size_code_16bit = 0x7E; // 126
 static uint8_t const payload_size_code_64bit = 0x7F; // 127
 
@@ -187,11 +187,11 @@ typedef uint32_converter masking_key_type;
 /// The constant size component of a WebSocket frame header
 struct basic_header {
     basic_header() : b0(0x00),b1(0x00) {}
-    
+
     basic_header(uint8_t p0, uint8_t p1) : b0(p0), b1(p1) {}
-    
-    basic_header(opcode::value op, uint64_t size, bool fin, bool mask, 
-        bool rsv1 = false, bool rsv2 = false, bool rsv3 = false) : b0(0x00), 
+
+    basic_header(opcode::value op, uint64_t size, bool fin, bool mask,
+        bool rsv1 = false, bool rsv2 = false, bool rsv3 = false) : b0(0x00),
         b1(0x00)
     {
         if (fin) {
@@ -207,13 +207,13 @@ struct basic_header {
             b0 |= BHB0_RSV3;
         }
         b0 |= (op & BHB0_OPCODE);
-        
+
         if (mask) {
             b1 |= BHB1_MASK;
         }
-        
+
         uint8_t basic_value;
-        
+
         if (size <= limits::payload_size_basic) {
             basic_value = static_cast<uint8_t>(size);
         } else if (size <= limits::payload_size_extended) {
@@ -221,11 +221,11 @@ struct basic_header {
         } else {
             basic_value = payload_size_code_64bit;
         }
-        
-        
+
+
         b1 |= basic_value;
     }
-    
+
     uint8_t b0;
     uint8_t b1;
 };
@@ -235,19 +235,19 @@ struct extended_header {
     extended_header() {
         std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
     }
-    
+
     extended_header(uint64_t payload_size) {
         std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
-        
+
         copy_payload(payload_size);
     }
-    
+
     extended_header(uint64_t payload_size, uint32_t masking_key) {
         std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
-        
+
         // Copy payload size
         int offset = copy_payload(payload_size);
-        
+
         // Copy Masking Key
         uint32_converter temp32;
         temp32.i = masking_key;
@@ -258,17 +258,17 @@ struct extended_header {
 private:
     int copy_payload(uint64_t payload_size) {
         int payload_offset = 0;
-        
+
         if (payload_size <= limits::payload_size_basic) {
             payload_offset = 8;
         } else if (payload_size <= limits::payload_size_extended) {
             payload_offset = 6;
         }
-        
+
         uint64_converter temp64;
         temp64.i = lib::net::htonll(payload_size);
         std::copy(temp64.c+payload_offset,temp64.c+8,bytes);
-        
+
         return 8-payload_offset;
     }
 };
@@ -299,16 +299,16 @@ size_t circshift_prepared_key(size_t prepared_key, size_t offset);
 
 // Functions for performing xor based masking and unmasking
 template <typename input_iter, typename output_iter>
-void byte_mask(input_iter b, input_iter e, output_iter o, masking_key_type 
+void byte_mask(input_iter b, input_iter e, output_iter o, masking_key_type
     const & key, size_t key_offset = 0);
 template <typename iter_type>
 void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
     size_t key_offset = 0);
-void word_mask_exact(uint8_t * input, uint8_t * output, size_t length, 
+void word_mask_exact(uint8_t * input, uint8_t * output, size_t length,
     masking_key_type const & key);
-void word_mask_exact(uint8_t * data, size_t length, masking_key_type const & 
+void word_mask_exact(uint8_t * data, size_t length, masking_key_type const &
     key);
-size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length, 
+size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length,
     size_t prepared_key);
 size_t word_mask_circ(uint8_t * data, size_t length, size_t prepared_key);
 
@@ -413,12 +413,12 @@ inline void set_masked(basic_header & h, bool value) {
 
 /// Extracts the raw payload length specified in the basic header
 /**
- * A basic WebSocket frame header contains a 7 bit value that represents the 
- * payload size. There are two reserved values that are used to indicate that 
- * the actual payload size will not fit in 7 bits and that the full payload 
+ * A basic WebSocket frame header contains a 7 bit value that represents the
+ * payload size. There are two reserved values that are used to indicate that
+ * the actual payload size will not fit in 7 bits and that the full payload
  * size is included in a separate field. The values are as follows:
  *
- * PAYLOAD_SIZE_CODE_16BIT (0x7E) indicates that the actual payload is less 
+ * PAYLOAD_SIZE_CODE_16BIT (0x7E) indicates that the actual payload is less
  * than 16 bit
  *
  * PAYLOAD_SIZE_CODE_64BIT (0x7F) indicates that the actual payload is less
@@ -435,7 +435,7 @@ inline uint8_t get_basic_size(const basic_header &h) {
 /**
  * A WebSocket frame header always has at least two bytes. Encoded within the
  * first two bytes is all the information necessary to calculate the full
- * (variable) header length. get_header_len() calculates the full header 
+ * (variable) header length. get_header_len() calculates the full header
  * length for the given two byte basic header.
  *
  * @param h Basic frame header to extract size from.
@@ -443,16 +443,16 @@ inline uint8_t get_basic_size(const basic_header &h) {
  */
 inline size_t get_header_len(basic_header const & h) {
     // TODO: check extensions?
-    
+
     // masking key offset represents the space used for the extended length
     // fields
     size_t size = BASIC_HEADER_LENGTH + get_masking_key_offset(h);
-    
+
     // If the header is masked there is a 4 byte masking key
-    if (get_masked(h)) { 
+    if (get_masked(h)) {
         size += 4;
     }
-    
+
     return size;
 }
 
@@ -463,12 +463,12 @@ inline size_t get_header_len(basic_header const & h) {
  * @param [in] The size to set.
  * @return What error occurred, if any.
  */
-inline lib::error_code set_size(basic_header & h, extended_header & eh, uint64_t 
+inline lib::error_code set_size(basic_header & h, extended_header & eh, uint64_t
     size)
 {
     // make sure value isn't too big
     uint8_t basic_value;
-    
+
     if (size <= limits::payload_size_basic) {
         basic_value = static_cast<uint8_t>(size);
     } else if (size <= limits::payload_size_extended) {
@@ -479,9 +479,9 @@ inline lib::error_code set_size(basic_header & h, extended_header & eh, uint64_t
         // error
         return lib::error_code();
     }
-    
+
     h.b1 = (basic_value & BHB1_PAYLOAD) | (h.b1 & BHB1_MASK);
-    
+
     return lib::error_code();
 }
 
@@ -510,22 +510,22 @@ inline unsigned int get_masking_key_offset(const basic_header &h) {
  * contiguous frame header string for the purposes of writing out to the wire.
  *
  * @param h The basic header to include
- * @param e The extended header to include 
+ * @param e The extended header to include
  *
  * @return A contiguous string containing h and e
  */
-inline std::string prepare_header(const basic_header &h, const 
+inline std::string prepare_header(const basic_header &h, const
     extended_header &e)
 {
     std::string ret;
-    
+
     ret.push_back(char(h.b0));
     ret.push_back(char(h.b1));
     ret.append(
         reinterpret_cast<const char*>(e.bytes),
         get_header_len(h)-BASIC_HEADER_LENGTH
     );
-    
+
     return ret;
 }
 
@@ -541,7 +541,7 @@ inline std::string prepare_header(const basic_header &h, const
  *
  * @return The masking key as an integer.
  */
-inline masking_key_type get_masking_key(const basic_header &h, const 
+inline masking_key_type get_masking_key(const basic_header &h, const
     extended_header &e)
 {
     masking_key_type temp32;
@@ -598,7 +598,7 @@ inline uint64_t get_jumbo_size(const extended_header &e) {
  *
  * @return The size encoded in the combined header in host byte order.
  */
-inline uint64_t get_payload_size(const basic_header &h, const 
+inline uint64_t get_payload_size(const basic_header &h, const
     extended_header &e)
 {
     uint8_t val = get_basic_size(h);
@@ -613,7 +613,7 @@ inline uint64_t get_payload_size(const basic_header &h, const
 }
 
 /// Extract a masking key into a value the size of a machine word.
-/** 
+/**
  * Machine word size must be 4 or 8.
  *
  * @param key Masking key to extract from
@@ -622,7 +622,7 @@ inline uint64_t get_payload_size(const basic_header &h, const
  */
 inline size_t prepare_masking_key(const masking_key_type& key) {
     size_t low_bits = static_cast<size_t>(key.i);
-    
+
     if (sizeof(size_t) == 8) {
         uint64_t high_bits = static_cast<size_t>(key.i);
         return static_cast<size_t>((high_bits << 32) | low_bits);
@@ -632,9 +632,9 @@ inline size_t prepare_masking_key(const masking_key_type& key) {
 }
 
 /// circularly shifts the supplied prepared masking key by offset bytes
-/** 
+/**
  * Prepared_key must be the output of prepare_masking_key with the associated
- * restrictions on the machine word size. offset must be greater than or equal 
+ * restrictions on the machine word size. offset must be greater than or equal
  * to zero and less than sizeof(size_t).
  */
 inline size_t circshift_prepared_key(size_t prepared_key, size_t offset) {
@@ -653,21 +653,21 @@ inline size_t circshift_prepared_key(size_t prepared_key, size_t offset) {
  * Performs masking in place using the supplied key offset by the supplied
  * offset number of bytes.
  *
- * This function is simple and can be done in place on input with arbitrary 
+ * This function is simple and can be done in place on input with arbitrary
  * lengths and does not vary based on machine word size. It is slow.
  *
  * @param b Beginning iterator to start masking
- * 
+ *
  * @param e Ending iterator to end masking
  *
  * @param o Beginning iterator to store masked results
  *
  * @param key 32 bit key to mask with.
- * 
+ *
  * @param key_offset offset value to start masking at.
  */
 template <typename input_iter, typename output_iter>
-void byte_mask(input_iter first, input_iter last, output_iter result, 
+void byte_mask(input_iter first, input_iter last, output_iter result,
     masking_key_type const & key, size_t key_offset)
 {
     size_t key_index = key_offset%4;
@@ -685,15 +685,15 @@ void byte_mask(input_iter first, input_iter last, output_iter result,
  * Performs masking in place using the supplied key offset by the supplied
  * offset number of bytes.
  *
- * This function is simple and can be done in place on input with arbitrary 
+ * This function is simple and can be done in place on input with arbitrary
  * lengths and does not vary based on machine word size. It is slow.
  *
  * @param b Beginning iterator to start masking
- * 
+ *
  * @param e Ending iterator to end masking
  *
  * @param key 32 bit key to mask with.
- * 
+ *
  * @param key_offset offset value to start masking at.
  */
 template <typename iter_type>
@@ -713,9 +713,9 @@ void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
  * Masking is done in word by word chunks with the remainder not divisible by
  * the word size done byte by byte.
  *
- * input and output must both be at least length bytes. Exactly length bytes 
+ * input and output must both be at least length bytes. Exactly length bytes
  * will be written.
- * 
+ *
  * @param input buffer to mask or unmask
  *
  * @param output buffer to store the output. May be the same as input.
@@ -724,18 +724,18 @@ void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
  *
  * @param key Masking key to use
  */
-inline void word_mask_exact(uint8_t* input, uint8_t* output, size_t length, 
+inline void word_mask_exact(uint8_t* input, uint8_t* output, size_t length,
     const masking_key_type& key)
 {
     size_t prepared_key = prepare_masking_key(key);
     size_t n = length/sizeof(size_t);
     size_t* input_word = reinterpret_cast<size_t*>(input);
     size_t* output_word = reinterpret_cast<size_t*>(output);
-    
+
     for (size_t i = 0; i < n; i++) {
         output_word[i] = input_word[i] ^ prepared_key;
     }
-    
+
     for (size_t i = n*sizeof(size_t); i < length; i++) {
         output[i] = input[i] ^ key.c[i%4];
     }
@@ -746,14 +746,14 @@ inline void word_mask_exact(uint8_t* input, uint8_t* output, size_t length,
  * In place version of word_mask_exact
  *
  * @see word_mask_exact
- * 
+ *
  * @param data buffer to read and write from
  *
  * @param length length of data buffer
  *
  * @param key Masking key to use
  */
-inline void word_mask_exact(uint8_t* data, size_t length, const 
+inline void word_mask_exact(uint8_t* data, size_t length, const
     masking_key_type& key)
 {
     word_mask_exact(data,data,length,key);
@@ -762,24 +762,24 @@ inline void word_mask_exact(uint8_t* data, size_t length, const
 /// Circular word aligned mask/unmask
 /**
  * Performs a circular mask/unmask in word sized chunks using pre-prepared keys
- * that store state between calls. Best for providing streaming masking or 
+ * that store state between calls. Best for providing streaming masking or
  * unmasking of small chunks at a time of a larger message. Requires that the
  * underlying allocated size of the data buffer be a multiple of the word size.
- * Data in the buffer after `length` will be overwritten only with the same 
+ * Data in the buffer after `length` will be overwritten only with the same
  * values that were originally present.
  *
  * Buffer based word by word masking and unmasking for WebSocket payloads.
  * Performs masking in place using the supplied key. Casts the data buffer to
- * an array of size_t's and performs masking word by word. The underlying 
+ * an array of size_t's and performs masking word by word. The underlying
  * buffer size must be a muliple of the word size.
- * 
- * word_mask returns a copy of prepared_key circularly shifted based on the 
- * length value. The returned value may be fed back into word_mask when more 
+ *
+ * word_mask returns a copy of prepared_key circularly shifted based on the
+ * length value. The returned value may be fed back into word_mask when more
  * data is available.
  *
  * input and output must both have length at least:
  *    ceil(length/sizeof(size_t))*sizeof(size_t)
- * Exactly that many bytes will be written, although only exactly length bytes 
+ * Exactly that many bytes will be written, although only exactly length bytes
  * will be changed (trailing bytes will be replaced without masking)
  *
  * @param data Character buffer to mask
@@ -790,26 +790,26 @@ inline void word_mask_exact(uint8_t* data, size_t length, const
  *
  * @return the prepared_key shifted to account for the input length
  */
-inline size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length, 
+inline size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length,
     size_t prepared_key)
 {
     size_t n = length / sizeof(size_t); // whole words
     size_t l = length - (n * sizeof(size_t)); // remaining bytes
     size_t * input_word = reinterpret_cast<size_t *>(input);
     size_t * output_word = reinterpret_cast<size_t *>(output);
-    
+
     // mask word by word
     for (size_t i = 0; i < n; i++) {
         output_word[i] = input_word[i] ^ prepared_key;
     }
-    
+
     // mask partial word at the end
     size_t start = length - l;
     uint8_t * byte_key = reinterpret_cast<uint8_t *>(&prepared_key);
     for (size_t i = 0; i < l; ++i) {
         output[start+i] = input[start+i] ^ byte_key[i];
     }
-    
+
     return circshift_prepared_key(prepared_key,l);
 }
 
@@ -834,14 +834,14 @@ inline size_t word_mask_circ(uint8_t* data, size_t length, size_t prepared_key){
 /// Circular byte aligned mask/unmask
 /**
  * Performs a circular mask/unmask in byte sized chunks using pre-prepared keys
- * that store state between calls. Best for providing streaming masking or 
+ * that store state between calls. Best for providing streaming masking or
  * unmasking of small chunks at a time of a larger message. Requires that the
  * underlying allocated size of the data buffer be a multiple of the word size.
- * Data in the buffer after `length` will be overwritten only with the same 
+ * Data in the buffer after `length` will be overwritten only with the same
  * values that were originally present.
- * 
- * word_mask returns a copy of prepared_key circularly shifted based on the 
- * length value. The returned value may be fed back into byte_mask when more 
+ *
+ * word_mask returns a copy of prepared_key circularly shifted based on the
+ * length value. The returned value may be fed back into byte_mask when more
  * data is available.
  *
  * @param data Character buffer to mask
@@ -852,16 +852,16 @@ inline size_t word_mask_circ(uint8_t* data, size_t length, size_t prepared_key){
  *
  * @return the prepared_key shifted to account for the input length
  */
-inline size_t byte_mask_circ(uint8_t * input, uint8_t * output, size_t length, 
+inline size_t byte_mask_circ(uint8_t * input, uint8_t * output, size_t length,
     size_t prepared_key)
 {
     uint32_converter key;
     key.i = prepared_key;
-    
+
     for (size_t i = 0; i < length; ++i) {
         output[i] = input[i] ^ key.c[i % 4];
     }
-    
+
     return circshift_prepared_key(prepared_key,length % 4);
 }
 
diff --git a/websocketpp/http/constants.hpp b/websocketpp/http/constants.hpp
index f117048730..3edc3eb0fc 100644
--- a/websocketpp/http/constants.hpp
+++ b/websocketpp/http/constants.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_CONSTANTS_HPP
@@ -36,34 +36,34 @@ namespace websocketpp {
 namespace http {
     /// The type of an HTTP attribute list
     /**
-     * The attribute list is an unordered key/value map. Encoded attribute 
-     * values are delimited by semicolons. 
-     */ 
+     * The attribute list is an unordered key/value map. Encoded attribute
+     * values are delimited by semicolons.
+     */
     typedef std::map<std::string,std::string> attribute_list;
-    
+
     /// The type of an HTTP parameter list
     /**
-     * The parameter list is an ordered pairing of a parameter and its 
-     * associated attribute list. Encoded parameter values are delimited by 
+     * The parameter list is an ordered pairing of a parameter and its
+     * associated attribute list. Encoded parameter values are delimited by
      * commas.
      */
     typedef std::vector< std::pair<std::string,attribute_list> > parameter_list;
-    
+
     /// Literal value of the HTTP header delimiter
     static char const header_delimiter[] = "\r\n";
-    
+
     /// Literal value of the HTTP header separator
     static char const header_separator[] = ": ";
-    
+
     /// Literal value of an empty header
     static std::string const empty_header = "";
-    
+
     /// Maximum size in bytes before rejecting an HTTP header as too big.
     size_t const max_header_size = 16000;
-    
+
     /// Number of bytes to use for temporary istream read buffers
     size_t const istream_buffer = 512;
-    
+
     /// invalid HTTP token characters
     /**
      * 0x00 - 0x32, 0x7f-0xff
@@ -87,17 +87,17 @@ namespace http {
         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // e0..ef
         0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // f0..ff
     };
-    
+
     /// Is the character a token
     inline bool is_token_char(unsigned char c) {
         return (header_token[c] == 1);
     }
-    
+
     /// Is the character a non-token
     inline bool is_not_token_char(unsigned char c) {
         return !header_token[c];
     }
-    
+
     /// Is the character whitespace
     /**
      * whitespace is space (32) or horizontal tab (9)
@@ -115,10 +115,10 @@ namespace http {
     namespace status_code {
         enum value {
             uninitialized = 0,
-            
+
             continue_code = 100,
             switching_protocols = 101,
-            
+
             ok = 200,
             created = 201,
             accepted = 202,
@@ -126,7 +126,7 @@ namespace http {
             no_content = 204,
             reset_content = 205,
             partial_content = 206,
-            
+
             multiple_choices = 300,
             moved_permanently = 301,
             found = 302,
@@ -134,7 +134,7 @@ namespace http {
             not_modified = 304,
             use_proxy = 305,
             temporary_redirect = 307,
-            
+
             bad_request = 400,
             unauthorized = 401,
             payment_required = 402,
@@ -158,7 +158,7 @@ namespace http {
             precondition_required = 428,
             too_many_requests = 429,
             request_header_fields_too_large = 431,
-            
+
             internal_server_error = 500,
             not_implemented = 501,
             bad_gateway = 502,
@@ -168,7 +168,7 @@ namespace http {
             not_extended = 510,
             network_authentication_required = 511
         };
-        
+
         // TODO: should this be inline?
         inline std::string get_string(value c) {
             switch (c) {
@@ -273,9 +273,9 @@ namespace http {
             }
         }
     }
-    
+
     class exception : public std::exception {
-    public: 
+    public:
         exception(const std::string& log_msg,
                   status_code::value error_code,
                   const std::string& error_msg = "",
@@ -284,13 +284,13 @@ namespace http {
           , m_error_msg(error_msg)
           , m_body(body)
           , m_error_code(error_code) {}
-        
+
         ~exception() throw() {}
-        
+
         virtual const char* what() const throw() {
             return m_msg.c_str();
         }
-        
+
         std::string         m_msg;
         std::string         m_error_msg;
         std::string         m_body;
diff --git a/websocketpp/http/impl/parser.hpp b/websocketpp/http/impl/parser.hpp
index 36c9b05529..0ceac2ed57 100644
--- a/websocketpp/http/impl/parser.hpp
+++ b/websocketpp/http/impl/parser.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_PARSER_IMPL_HPP
@@ -50,7 +50,7 @@ inline std::string const & parser::get_header(std::string const & key) const {
     }
 }
 
-inline bool parser::get_header_as_plist(std::string const & key, 
+inline bool parser::get_header_as_plist(std::string const & key,
     parameter_list & out) const
 {
     header_list::const_iterator it = m_headers.find(key);
@@ -99,7 +99,7 @@ inline void parser::set_body(std::string const & value) {
     m_body = value;
 }
 
-inline bool parser::parse_parameter_list(std::string const & in, 
+inline bool parser::parse_parameter_list(std::string const & in,
     parameter_list & out) const
 {
     if (in.size() == 0) {
@@ -125,15 +125,15 @@ inline bool parser::parse_headers(std::istream & s) {
 
         end = header.find(header_separator,0);
 
-        if (end != std::string::npos) {         
+        if (end != std::string::npos) {
             append_header(header.substr(0,end),header.substr(end+2));
         }
     }
-    
+
     return true;
 }
 
-inline void parser::process_header(std::string::iterator begin, 
+inline void parser::process_header(std::string::iterator begin,
     std::string::iterator end)
 {
     std::string::iterator cursor = std::search(
@@ -142,23 +142,23 @@ inline void parser::process_header(std::string::iterator begin,
         header_separator,
         header_separator + sizeof(header_separator) - 1
     );
-    
+
     if (cursor == end) {
         throw exception("Invalid header line",status_code::bad_request);
     }
-    
+
     append_header(std::string(begin,cursor),
                   std::string(cursor+sizeof(header_separator)-1,end));
 }
 
 inline std::string parser::raw_headers() const {
     std::stringstream raw;
-    
+
     header_list::const_iterator it;
     for (it = m_headers.begin(); it != m_headers.end(); it++) {
         raw << it->first << ": " << it->second << "\r\n";
     }
-    
+
     return raw.str();
 }
 
diff --git a/websocketpp/http/impl/request.hpp b/websocketpp/http/impl/request.hpp
index 587445791b..804a7faff8 100644
--- a/websocketpp/http/impl/request.hpp
+++ b/websocketpp/http/impl/request.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_PARSER_REQUEST_IMPL_HPP
@@ -39,47 +39,47 @@ namespace parser {
 
 inline bool request::parse_complete(std::istream& s) {
     std::string request;
-    
+
     // get status line
     std::getline(s, request);
-    
+
     if (request[request.size()-1] == '\r') {
         request.erase(request.end()-1);
-        
+
         std::stringstream ss(request);
         std::string val;
-        
+
         ss >> val;
         set_method(val);
-        
+
         ss >> val;
         set_uri(val);
-        
+
         ss >> val;
         set_version(val);
     } else {
         return false;
     }
-    
+
     return parse_headers(s);
 }
-    
+
 inline size_t request::consume(const char *buf, size_t len) {
     if (m_ready) {return 0;}
-    
+
     if (m_buf->size() + len > max_header_size) {
         // exceeded max header size
         throw exception("Maximum header size exceeded.",
                         status_code::request_header_fields_too_large);
     }
-    
+
     // copy new header bytes into buffer
     m_buf->append(buf,len);
-    
-    // Search for delimiter in buf. If found read until then. If not read all       
+
+    // Search for delimiter in buf. If found read until then. If not read all
     std::string::iterator begin = m_buf->begin();
     std::string::iterator end;
-        
+
     for (;;) {
         // search for line delimiter
         end = std::search(
@@ -88,7 +88,7 @@ inline size_t request::consume(const char *buf, size_t len) {
             header_delimiter,
             header_delimiter+sizeof(header_delimiter)-1
         );
-        
+
         //std::cout << "mark5: " << end-begin << std::endl;
         //std::cout << "mark6: " << sizeof(header_delimiter) << std::endl;
 
@@ -97,26 +97,26 @@ inline size_t request::consume(const char *buf, size_t len) {
             // remaining unprecessed bytes to the beginning of the buffer
             std::copy(begin,end,m_buf->begin());
             m_buf->resize(static_cast<std::string::size_type>(end-begin));
-                            
+
             return len;
         }
-        
-        //the range [begin,end) now represents a line to be processed.      
+
+        //the range [begin,end) now represents a line to be processed.
         if (end-begin == 0) {
             // we got a blank line
             if (m_method.empty() || get_header("Host") == "") {
                 throw exception("Incomplete Request",status_code::bad_request);
             }
             m_ready = true;
-            
+
             size_t bytes_processed = (
                 len - static_cast<std::string::size_type>(m_buf->end()-end)
                     + sizeof(header_delimiter) - 1
             );
-            
+
             // frees memory used temporarily during request parsing
             m_buf.reset();
-            
+
             // return number of bytes processed (starting bytes - bytes left)
             return bytes_processed;
         } else {
@@ -126,21 +126,21 @@ inline size_t request::consume(const char *buf, size_t len) {
                 this->process_header(begin,end);
             }
         }
-        
+
         begin = end+sizeof(header_delimiter)-1;
     }
 }
-    
+
 inline std::string request::raw() {
     // TODO: validation. Make sure all required fields have been set?
     std::stringstream raw;
-    
+
     raw << m_method << " " << m_uri << " " << get_version() << "\r\n";
     raw << raw_headers() << "\r\n" << m_body;
-    
+
     return raw.str();
 }
-    
+
 inline void request::set_method(const std::string& method) {
     if (std::find_if(method.begin(),method.end(),is_not_token_char) != method.end()) {
         throw exception("Invalid method token.",status_code::bad_request);
@@ -161,25 +161,25 @@ inline void request::set_uri(const std::string& uri) {
     m_uri = uri;
 }
 
-inline void request::process(std::string::iterator begin, std::string::iterator 
+inline void request::process(std::string::iterator begin, std::string::iterator
     end)
 {
     std::string::iterator cursor_start = begin;
     std::string::iterator cursor_end = std::find(begin,end,' ');
-    
+
     if (cursor_end == end) {
         throw exception("Invalid request line1",status_code::bad_request);
     }
-    
+
     set_method(std::string(cursor_start,cursor_end));
-    
+
     cursor_start = cursor_end+1;
     cursor_end = std::find(cursor_start,end,' ');
-    
+
     if (cursor_end == end) {
         throw exception("Invalid request line2",status_code::bad_request);
     }
-    
+
     set_uri(std::string(cursor_start,cursor_end));
     set_version(std::string(cursor_end+1,end));
 }
diff --git a/websocketpp/http/impl/response.hpp b/websocketpp/http/impl/response.hpp
index 44a1f5e0e4..bcddd17633 100644
--- a/websocketpp/http/impl/response.hpp
+++ b/websocketpp/http/impl/response.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_PARSER_RESPONSE_IMPL_HPP
@@ -39,25 +39,25 @@ namespace parser {
 
 inline size_t response::consume(const char *buf, size_t len) {
     if (m_state == DONE) {return 0;}
-    
+
     if (m_state == BODY) {
         return this->process_body(buf,len);
     }
-    
+
     if (m_read + len > max_header_size) {
         // exceeded max header size
         throw exception("Maximum header size exceeded.",
                         status_code::request_header_fields_too_large);
     }
-    
+
     // copy new header bytes into buffer
     m_buf->append(buf,len);
-    
-    // Search for delimiter in buf. If found read until then. If not read all       
+
+    // Search for delimiter in buf. If found read until then. If not read all
     std::string::iterator begin = m_buf->begin();
     std::string::iterator end = begin;
-    
-    
+
+
     for (;;) {
         // search for delimiter
         end = std::search(
@@ -66,57 +66,57 @@ inline size_t response::consume(const char *buf, size_t len) {
             header_delimiter,
             header_delimiter + sizeof(header_delimiter) - 1
         );
-                    
+
         if (end == m_buf->end()) {
             // we are out of bytes. Discard the processed bytes and copy the
             // remaining unprecessed bytes to the beginning of the buffer
             std::copy(begin,end,m_buf->begin());
             m_buf->resize(static_cast<std::string::size_type>(end-begin));
-            
+
             m_read +=len;
-                    
+
             return len;
         }
-        
+
         //the range [begin,end) now represents a line to be processed.
-        
-        if (end-begin == 0) {               
+
+        if (end-begin == 0) {
             // we got a blank line
             if (m_state == RESPONSE_LINE) {
                 throw exception("Incomplete Request",status_code::bad_request);
             }
-            
+
             // TODO: grab content-length
             std::string length = get_header("Content-Length");
-            
+
             if (length == "") {
                 // no content length found, read indefinitely
                 m_read = 0;
             } else {
                 std::istringstream ss(length);
-                
+
                 if ((ss >> m_read).fail()) {
                     throw exception("Unable to parse Content-Length header",
                                     status_code::bad_request);
                 }
             }
-            
+
             m_state = BODY;
-            
+
             // calc header bytes processed (starting bytes - bytes left)
             size_t read = (
                 len - static_cast<std::string::size_type>(m_buf->end() - end)
                 + sizeof(header_delimiter) - 1
             );
-            
+
             // if there were bytes left process them as body bytes
             if (read < len) {
                 read += this->process_body(buf+read,(len-read));
             }
-            
+
             // frees memory used temporarily during header parsing
             m_buf.reset();
-            
+
             return read;
         } else {
             if (m_state == RESPONSE_LINE) {
@@ -126,7 +126,7 @@ inline size_t response::consume(const char *buf, size_t len) {
                 this->process_header(begin,end);
             }
         }
-        
+
         begin = end+(sizeof(header_delimiter) - 1);
     }
 }
@@ -136,7 +136,7 @@ inline size_t response::consume(std::istream & s) {
     size_t bytes_read;
     size_t bytes_processed;
     size_t total = 0;
-    
+
     while (s.good()) {
         s.getline(buf,istream_buffer);
         bytes_read = static_cast<size_t>(s.gcount());
@@ -144,7 +144,7 @@ inline size_t response::consume(std::istream & s) {
         if (s.fail() || s.eof()) {
             bytes_processed = this->consume(buf,bytes_read);
             total += bytes_processed;
-            
+
             if (bytes_processed != bytes_read) {
                 // problem
                 break;
@@ -159,65 +159,65 @@ inline size_t response::consume(std::istream & s) {
             buf[bytes_read-1] = '\n';
             bytes_processed = this->consume(buf,bytes_read);
             total += bytes_processed;
-            
+
             if (bytes_processed != bytes_read) {
                 // problem
                 break;
             }
         }
     }
-    
+
     return total;
 }
 
 inline bool response::parse_complete(std::istream& s) {
     // parse a complete header (ie \r\n\r\n MUST be in the input stream)
     std::string response;
-    
+
     // get status line
     std::getline(s, response);
-    
+
     if (response[response.size()-1] == '\r') {
         response.erase(response.end()-1);
-        
+
         std::stringstream   ss(response);
         std::string         str_val;
         int                 int_val;
         char                char_val[256];
-        
+
         ss >> str_val;
         set_version(str_val);
-        
+
         ss >> int_val;
         ss.getline(char_val,256);
         set_status(status_code::value(int_val),std::string(char_val));
     } else {
         return false;
     }
-    
+
     return parse_headers(s);
 }
 
 inline std::string response::raw() const {
     // TODO: validation. Make sure all required fields have been set?
-    
+
     std::stringstream raw;
-    
+
     raw << get_version() << " " << m_status_code << " " << m_status_msg;
     raw << "\r\n" << raw_headers() << "\r\n";
-    
+
     raw << m_body;
-    
+
     return raw.str();
 }
-    
+
 inline void response::set_status(status_code::value code) {
     // TODO: validation?
     m_status_code = code;
     m_status_msg = get_string(code);
 }
 
-inline void response::set_status(status_code::value code, const std::string& 
+inline void response::set_status(status_code::value code, const std::string&
     msg)
 {
     // TODO: validation?
@@ -225,33 +225,33 @@ inline void response::set_status(status_code::value code, const std::string&
     m_status_msg = msg;
 }
 
-inline void response::process(std::string::iterator begin, 
+inline void response::process(std::string::iterator begin,
     std::string::iterator end)
 {
     std::string::iterator cursor_start = begin;
     std::string::iterator cursor_end = std::find(begin,end,' ');
-    
+
     if (cursor_end == end) {
         throw exception("Invalid response line",status_code::bad_request);
     }
-    
+
     set_version(std::string(cursor_start,cursor_end));
-    
+
     cursor_start = cursor_end+1;
     cursor_end = std::find(cursor_start,end,' ');
-    
+
     if (cursor_end == end) {
         throw exception("Invalid request line",status_code::bad_request);
     }
-    
+
     int code;
-    
+
     std::istringstream ss(std::string(cursor_start,cursor_end));
-                
+
     if ((ss >> code).fail()) {
         throw exception("Unable to parse response code",status_code::bad_request);
     }
-    
+
     set_status(status_code::value(code),std::string(cursor_end+1,end));
 }
 
@@ -263,12 +263,12 @@ inline size_t response::process_body(const char *buf, size_t len) {
         m_state = DONE;
         return 0;
     }
-    
+
     // Otherwise m_read is the number of bytes left.
     size_t to_read;
-    
+
     if (len >= m_read) {
-        // if we have more bytes than we need read, read only the amount needed 
+        // if we have more bytes than we need read, read only the amount needed
         // then set done state
         to_read = m_read;
         m_state = DONE;
@@ -276,7 +276,7 @@ inline size_t response::process_body(const char *buf, size_t len) {
         // we need more bytes than are available, read them all
         to_read = len;
     }
-    
+
     m_body.append(buf,to_read);
     m_read -= to_read;
     return to_read;
diff --git a/websocketpp/http/parser.hpp b/websocketpp/http/parser.hpp
index ff59d52a54..0bb52c2b6c 100644
--- a/websocketpp/http/parser.hpp
+++ b/websocketpp/http/parser.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_PARSER_HPP
@@ -54,7 +54,7 @@ typedef std::map<std::string, std::string, utility::ci_less > header_list;
 /**
  * Read until a non-token character is found and then return the token and
  * iterator to the next character to read
- * 
+ *
  * @param begin An iterator to the beginning of the sequence
  * @param end An iterator to the end of the sequence
  * @return A pair containing the token and an iterator to the next character in
@@ -71,12 +71,12 @@ std::pair<std::string,InputIterator> extract_token(InputIterator begin,
 /// Read and return the next quoted string in the stream
 /**
  * Read a double quoted string starting at `begin`. The quotes themselves are
- * stripped. The quoted value is returned along with an iterator to the next 
+ * stripped. The quoted value is returned along with an iterator to the next
  * character to read
- * 
+ *
  * @param begin An iterator to the beginning of the sequence
  * @param end An iterator to the end of the sequence
- * @return A pair containing the string read and an iterator to the next 
+ * @return A pair containing the string read and an iterator to the next
  * character in the stream
  */
 template <typename InputIterator>
@@ -84,7 +84,7 @@ std::pair<std::string,InputIterator> extract_quoted_string(InputIterator begin,
     InputIterator end)
 {
     std::string s;
-    
+
     if (end == begin) {
         return std::make_pair(s,begin);
     }
@@ -97,7 +97,7 @@ std::pair<std::string,InputIterator> extract_quoted_string(InputIterator begin,
     InputIterator marker = cursor;
 
     cursor = std::find(cursor,end,'"');
-    
+
     while (cursor != end) {
         // either this is the end or a quoted string
         if (*(cursor-1) == '\\') {
@@ -110,7 +110,7 @@ std::pair<std::string,InputIterator> extract_quoted_string(InputIterator begin,
             ++cursor;
             return std::make_pair(s,cursor);
         }
-        
+
         cursor = std::find(cursor,end,'"');
     }
 
@@ -120,8 +120,8 @@ std::pair<std::string,InputIterator> extract_quoted_string(InputIterator begin,
 /// Read and discard one unit of linear whitespace
 /**
  * Read one unit of linear white space and return the iterator to the character
- * afterwards. If `begin` is returned, no whitespace was extracted. 
- * 
+ * afterwards. If `begin` is returned, no whitespace was extracted.
+ *
  * @param begin An iterator to the beginning of the sequence
  * @param end An iterator to the end of the sequence
  * @return An iterator to the character after the linear whitespace read
@@ -131,7 +131,7 @@ InputIterator extract_lws(InputIterator begin, InputIterator end) {
     InputIterator it = begin;
 
     // strip leading CRLF
-    if (end-begin > 2 && *begin == '\r' && *(begin+1) == '\n' && 
+    if (end-begin > 2 && *begin == '\r' && *(begin+1) == '\n' &&
         is_whitespace_char(static_cast<unsigned char>(*(begin+2))))
     {
         it+=3;
@@ -143,10 +143,10 @@ InputIterator extract_lws(InputIterator begin, InputIterator end) {
 
 /// Read and discard linear whitespace
 /**
- * Read linear white space until a non-lws character is read and return an 
- * iterator to that character. If `begin` is returned, no whitespace was 
- * extracted. 
- * 
+ * Read linear white space until a non-lws character is read and return an
+ * iterator to that character. If `begin` is returned, no whitespace was
+ * extracted.
+ *
  * @param begin An iterator to the beginning of the sequence
  * @param end An iterator to the end of the sequence
  * @return An iterator to the character after the linear whitespace read
@@ -159,7 +159,7 @@ InputIterator extract_all_lws(InputIterator begin, InputIterator end) {
     do {
         // Pull value from previous iteration
         old_it = new_it;
-        
+
         // look ahead another pass
         new_it = extract_lws(old_it,end);
     } while (new_it != end && old_it != new_it);
@@ -169,16 +169,16 @@ InputIterator extract_all_lws(InputIterator begin, InputIterator end) {
 
 /// Extract HTTP attributes
 /**
- * An http attributes list is a semicolon delimited list of key value pairs in 
+ * An http attributes list is a semicolon delimited list of key value pairs in
  * the format: *( ";" attribute "=" value ) where attribute is a token and value
  * is a token or quoted string.
  *
- * Attributes extracted are appended to the supplied attributes list 
+ * Attributes extracted are appended to the supplied attributes list
  * `attributes`.
- * 
+ *
  * @param [in] begin An iterator to the beginning of the sequence
  * @param [in] end An iterator to the end of the sequence
- * @param [out] attributes A reference to the attributes list to append 
+ * @param [out] attributes A reference to the attributes list to append
  * attribute/value pairs extracted to
  * @return An iterator to the character after the last atribute read
  */
@@ -198,7 +198,7 @@ InputIterator extract_attributes(InputIterator begin, InputIterator end,
 
     while (cursor != end) {
         std::string name;
-        
+
         cursor = http::parser::extract_all_lws(cursor,end);
         if (cursor == end) {
             break;
@@ -206,7 +206,7 @@ InputIterator extract_attributes(InputIterator begin, InputIterator end,
 
         if (first) {
             // ignore this check for the very first pass
-            first = false;  
+            first = false;
         } else {
             if (*cursor == ';') {
                 // advance past the ';'
@@ -236,7 +236,7 @@ InputIterator extract_attributes(InputIterator begin, InputIterator end,
             attributes[name] = "";
             continue;
         }
-        
+
         // advance past the '='
         ++cursor;
 
@@ -245,7 +245,7 @@ InputIterator extract_attributes(InputIterator begin, InputIterator end,
             // error: expected a token or quoted string
             return begin;
         }
-        
+
         ret = http::parser::extract_quoted_string(cursor,end);
         if (ret.second != cursor) {
             attributes[name] = ret.first;
@@ -262,26 +262,26 @@ InputIterator extract_attributes(InputIterator begin, InputIterator end,
             cursor = ret.second;
         }
     }
-    
+
     return cursor;
 }
 
 /// Extract HTTP parameters
 /**
- * An http parameters list is a comma delimited list of tokens followed by 
+ * An http parameters list is a comma delimited list of tokens followed by
  * optional semicolon delimited attributes lists.
  *
- * Parameters extracted are appended to the supplied parameters list 
+ * Parameters extracted are appended to the supplied parameters list
  * `parameters`.
- * 
+ *
  * @param [in] begin An iterator to the beginning of the sequence
  * @param [in] end An iterator to the end of the sequence
- * @param [out] parameters A reference to the parameters list to append 
+ * @param [out] parameters A reference to the parameters list to append
  * paramter values extracted to
  * @return An iterator to the character after the last parameter read
  */
 template <typename InputIterator>
-InputIterator extract_parameters(InputIterator begin, InputIterator end, 
+InputIterator extract_parameters(InputIterator begin, InputIterator end,
     parameter_list &parameters)
 {
     InputIterator cursor;
@@ -293,7 +293,7 @@ InputIterator extract_parameters(InputIterator begin, InputIterator end,
 
     cursor = begin;
     std::pair<std::string,InputIterator> ret;
-    
+
     /**
      * LWS
      * token
@@ -319,7 +319,7 @@ InputIterator extract_parameters(InputIterator begin, InputIterator end,
             parameter_name = ret.first;
             cursor = ret.second;
         }
-        
+
         // Safe break point, insert parameter with blank attributes and exit
         cursor = http::parser::extract_all_lws(cursor,end);
         if (cursor == end) {
@@ -342,14 +342,14 @@ InputIterator extract_parameters(InputIterator begin, InputIterator end,
 
             cursor = acursor;
         }
-        
+
         // insert parameter into output list
         //parameters[parameter_name] = attributes;
         parameters.push_back(std::make_pair(parameter_name,attributes));
-        
+
         cursor = http::parser::extract_all_lws(cursor,end);
         if (cursor == end) {break;}
-        
+
         // if next char is ',' then read another parameter, else stop
         if (*cursor != ',') {
             break;
@@ -363,7 +363,7 @@ InputIterator extract_parameters(InputIterator begin, InputIterator end,
             return begin;
         }
     }
-    
+
     return cursor;
 }
 
@@ -373,7 +373,7 @@ InputIterator extract_parameters(InputIterator begin, InputIterator end,
  * as headers, versions, bodies, etc.
  */
 class parser {
-public:    
+public:
     /// Get the HTTP version string
     /**
      * @return The version string for this parser
@@ -402,14 +402,14 @@ public:
 
     /// Extract an HTTP parameter list from a parser header.
     /**
-     * If the header requested doesn't exist or exists and is empty the 
+     * If the header requested doesn't exist or exists and is empty the
      * parameter list is valid (but empty).
      *
      * @param [in] key The name/key of the HTTP header to use as input.
      * @param [out] out The parameter list to store extracted parameters in.
      * @return Whether or not the input was a valid parameter list.
      */
-    bool get_header_as_plist(std::string const & key, parameter_list & out) 
+    bool get_header_as_plist(std::string const & key, parameter_list & out)
         const;
 
     /// Append a value to an existing HTTP header
@@ -431,8 +431,8 @@ public:
 
     /// Set a value for an HTTP header, replacing an existing value
     /**
-     * This method will set the value of the HTTP header `key` with the 
-     * indicated value. If a header with the name `key` already exists, `val` 
+     * This method will set the value of the HTTP header `key` with the
+     * indicated value. If a header with the name `key` already exists, `val`
      * will replace the existing value.
      *
      * @todo Make this method case insensitive.
@@ -448,7 +448,7 @@ public:
 
     /// Remove a header from the parser
     /**
-     * Removes the header entirely from the parser. This is different than 
+     * Removes the header entirely from the parser. This is different than
      * setting the value of the header to blank.
      *
      * @todo Make this method case insensitive.
@@ -459,7 +459,7 @@ public:
 
     /// Set HTTP body
     /**
-     * Sets the body of the HTTP object and fills in the appropriate content 
+     * Sets the body of the HTTP object and fills in the appropriate content
      * length header.
      *
      * @param [in] value The value to set the body to.
@@ -474,7 +474,7 @@ public:
      * set_body will also set the Content-Length HTTP header to the appropriate
      * value. If you want the Content-Length header to be something else, do so
      * via replace_header("Content-Length") after calling set_body()
-     * 
+     *
      * @param value String data to include as the body content.
      */
     void set_body(std::string const & value);
diff --git a/websocketpp/http/request.hpp b/websocketpp/http/request.hpp
index 09edff69b6..1b8c3e2a34 100644
--- a/websocketpp/http/request.hpp
+++ b/websocketpp/http/request.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_PARSER_REQUEST_HPP
@@ -39,65 +39,65 @@ namespace parser {
 /**
  * http::request provides the following functionality for working with HTTP
  * requests.
- * 
+ *
  * - Initialize request via manually setting each element
  * - Initialize request via reading raw bytes and parsing
  * - Once initialized, access individual parsed elements
  * - Once initialized, read entire request as raw bytes
  */
 class request : public parser {
-public: 
+public:
     typedef request type;
     typedef lib::shared_ptr<type> ptr;
 
-    request() 
+    request()
       : m_buf(new std::string())
       , m_ready(false) {}
-    
+
     /// DEPRECATED parse a complete header (\r\n\r\n MUST be in the istream)
     bool parse_complete(std::istream& s);
-    
+
     /// Process bytes in the input buffer
     /**
-     * Process up to len bytes from input buffer buf. Returns the number of 
+     * Process up to len bytes from input buffer buf. Returns the number of
      * bytes processed. Bytes left unprocessed means bytes left over after the
      * final header delimiters.
-     * 
-     * Consume is a streaming processor. It may be called multiple times on one 
-     * request and the full headers need not be available before processing can 
+     *
+     * Consume is a streaming processor. It may be called multiple times on one
+     * request and the full headers need not be available before processing can
      * begin. If the end of the request was reached during this call to consume
      * the ready flag will be set. Further calls to consume once ready will be
      * ignored.
-     * 
+     *
      * Consume will throw an http::exception in the case of an error. Typical
      * error reasons include malformed requests, incomplete requests, and max
      * header size being reached.
-     * 
+     *
      * @param buf Pointer to byte buffer
      * @param len Size of byte buffer
      * @return Number of bytes processed.
      */
     size_t consume(const char *buf, size_t len);
-    
+
     /// Returns whether or not the request is ready for reading.
     bool ready() const {
         return m_ready;
     }
-    
+
     /// Returns the full raw request
     std::string raw();
-    
+
     /// Set the HTTP method. Must be a valid HTTP token
     void set_method(const std::string& method);
-    
+
     /// Return the request method
     const std::string& get_method() const {
         return m_method;
     }
-    
+
     /// Set the HTTP uri. Must be a valid HTTP uri
     void set_uri(const std::string& uri);
-    
+
     /// Return the requested URI
     const std::string& get_uri() const {
         return m_uri;
@@ -106,7 +106,7 @@ public:
 private:
     /// Helper function for message::consume. Process request line
     void process(std::string::iterator begin, std::string::iterator end);
-    
+
     lib::shared_ptr<std::string>    m_buf;
     std::string                     m_method;
     std::string                     m_uri;
diff --git a/websocketpp/http/response.hpp b/websocketpp/http/response.hpp
index f3faf91154..1ee622b178 100644
--- a/websocketpp/http/response.hpp
+++ b/websocketpp/http/response.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef HTTP_PARSER_RESPONSE_HPP
@@ -38,16 +38,16 @@ namespace parser {
 /**
  * http::response provides the following functionality for working with HTTP
  * responses.
- * 
+ *
  * - Initialize response via manually setting each element
  * - Initialize response via reading raw bytes and parsing
  * - Once initialized, access individual parsed elements
  * - Once initialized, read entire response as raw bytes
- * 
- * http::response checks for header completeness separately from the full 
+ *
+ * http::response checks for header completeness separately from the full
  * response. Once the header is complete, the Content-Length header is read to
  * determine when to stop reading body bytes. If no Content-Length is present
- * ready() will never return true. It is the responsibility of the caller to 
+ * ready() will never return true. It is the responsibility of the caller to
  * consume to determine when the response is complete (ie when the connection
  * terminates, or some other metric).
  */
@@ -55,37 +55,37 @@ class response : public parser {
 public:
     typedef response type;
     typedef lib::shared_ptr<type> ptr;
-    
-    response() 
+
+    response()
       : m_read(0)
       , m_buf(new std::string())
       , m_status_code(status_code::uninitialized)
       , m_state(RESPONSE_LINE) {}
-    
+
     /// Process bytes in the input buffer
     /**
-     * Process up to len bytes from input buffer buf. Returns the number of 
+     * Process up to len bytes from input buffer buf. Returns the number of
      * bytes processed. Bytes left unprocessed means bytes left over after the
      * final header delimiters.
-     * 
-     * Consume is a streaming processor. It may be called multiple times on one 
-     * response and the full headers need not be available before processing can 
+     *
+     * Consume is a streaming processor. It may be called multiple times on one
+     * response and the full headers need not be available before processing can
      * begin. If the end of the response was reached during this call to consume
      * the ready flag will be set. Further calls to consume once ready will be
      * ignored.
-     * 
+     *
      * Consume will throw an http::exception in the case of an error. Typical
      * error reasons include malformed responses, incomplete responses, and max
      * header size being reached.
-     * 
+     *
      * @param buf Pointer to byte buffer
      * @param len Size of byte buffer
      * @return Number of bytes processed.
      */
     size_t consume(const char *buf, size_t len);
-    
+
     size_t consume(std::istream & s);
-    
+
     /// Returns true if the response is ready.
     /**
      * @note will never return true if the content length header is not present
@@ -93,46 +93,46 @@ public:
     bool ready() const {
         return m_state == DONE;
     }
-    
+
     /// Returns true if the response headers are fully parsed.
     bool headers_ready() const {
         return (m_state == BODY || m_state == DONE);
     }
-    
+
     /// DEPRECATED parse a complete response from a pre-delimited istream
     bool parse_complete(std::istream& s);
-    
+
     /// Returns the full raw response
     std::string raw() const;
-    
+
     /// Set response status code and message
     /**
      * Sets the response status code to `code` and looks up the corresponding
      * message for standard codes. Non-standard codes will be entered as Unknown
-     * use set_status(status_code::value,std::string) overload to set both 
+     * use set_status(status_code::value,std::string) overload to set both
      * values explicitly.
-     * 
+     *
      * @param code Code to set
      * @param msg Message to set
      */
     void set_status(status_code::value code);
-    
+
     /// Set response status code and message
     /**
      * Sets the response status code and message to independent custom values.
      * use set_status(status_code::value) to set the code and have the standard
      * message be automatically set.
-     * 
+     *
      * @param code Code to set
      * @param msg Message to set
      */
     void set_status(status_code::value code, const std::string& msg);
-    
+
     /// Return the response status code
     status_code::value get_status_code() const {
         return m_status_code;
     }
-    
+
     /// Return the response status message
     const std::string& get_status_msg() const {
         return m_status_msg;
@@ -140,23 +140,23 @@ public:
 private:
     /// Helper function for consume. Process response line
     void process(std::string::iterator begin, std::string::iterator end);
-    
+
     /// Helper function for processing body bytes
     size_t process_body(const char *buf, size_t len);
-    
+
     enum state {
         RESPONSE_LINE = 0,
         HEADERS = 1,
         BODY = 2,
         DONE = 3
     };
-    
+
     std::string                     m_status_msg;
     size_t                          m_read;
     lib::shared_ptr<std::string>    m_buf;
     status_code::value              m_status_code;
     state                           m_state;
-    
+
 };
 
 } // namespace parser
diff --git a/websocketpp/impl/connection_impl.hpp b/websocketpp/impl/connection_impl.hpp
index aa82598b42..4b4aa361e5 100644
--- a/websocketpp/impl/connection_impl.hpp
+++ b/websocketpp/impl/connection_impl.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CONNECTION_IMPL_HPP
@@ -43,13 +43,13 @@ namespace istate = session::internal_state;
 
 template <typename config>
 void connection<config>::set_termination_handler(
-    termination_handler new_handler) 
+    termination_handler new_handler)
 {
     m_alog.write(log::alevel::devel,
         "connection set_termination_handler");
-    
+
     //scoped_lock_type lock(m_connection_state_lock);
-    
+
     m_termination_handler = new_handler;
 }
 
@@ -72,12 +72,12 @@ session::state::value connection<config>::get_state() const {
 }
 
 template <typename config>
-lib::error_code connection<config>::send(const std::string& payload, 
+lib::error_code connection<config>::send(const std::string& payload,
     frame::opcode::value op)
 {
     message_ptr msg = m_msg_manager->get_message(op,payload.size());
     msg->append_payload(payload);
-    
+
     return send(msg);
 }
 
@@ -87,7 +87,7 @@ lib::error_code connection<config>::send(const void* payload, size_t len,
 {
     message_ptr msg = m_msg_manager->get_message(op,len);
     msg->append_payload(payload,len);
-    
+
     return send(msg);
 }
 
@@ -95,39 +95,39 @@ template <typename config>
 lib::error_code connection<config>::send(typename config::message_type::ptr msg)
 {
     m_alog.write(log::alevel::devel,"connection send");
-    // TODO: 
-    
+    // TODO:
+
     if (m_state != session::state::open) {
        return error::make_error_code(error::invalid_state);
     }
-    
+
     message_ptr outgoing_msg;
     bool needs_writing = false;
-    
+
     if (msg->get_prepared()) {
         outgoing_msg = msg;
-        
+
         scoped_lock_type lock(m_write_lock);
         write_push(outgoing_msg);
         needs_writing = !m_write_flag && !m_send_queue.empty();
     } else {
         outgoing_msg = m_msg_manager->get_message();
-        
+
         if (!outgoing_msg) {
             return error::make_error_code(error::no_outgoing_buffers);
         }
-        
+
         scoped_lock_type lock(m_write_lock);
         lib::error_code ec = m_processor->prepare_data_frame(msg,outgoing_msg);
-        
+
         if (ec) {
             return ec;
         }
-        
+
         write_push(outgoing_msg);
         needs_writing = !m_write_flag && !m_send_queue.empty();
     }
-    
+
     if (needs_writing) {
         transport_con_type::dispatch(lib::bind(
             &type::write_frame,
@@ -146,7 +146,7 @@ void connection<config>::ping(const std::string& payload, lib::error_code& ec) {
         ec = error::make_error_code(error::invalid_state);
         return;
     }
-    
+
     message_ptr msg = m_msg_manager->get_message();
     if (!msg) {
         ec = error::make_error_code(error::no_outgoing_buffers);
@@ -155,14 +155,14 @@ void connection<config>::ping(const std::string& payload, lib::error_code& ec) {
 
     ec = m_processor->prepare_ping(payload,msg);
     if (ec) {return;}
-    
+
     // set ping timer if we are listening for one
     if (m_pong_timeout_handler) {
         // Cancel any existing timers
         if (m_ping_timer) {
             m_ping_timer->cancel();
         }
-        
+
         m_ping_timer = transport_con_type::set_timer(
             config::timeout_pong,
             lib::bind(
@@ -170,16 +170,16 @@ void connection<config>::ping(const std::string& payload, lib::error_code& ec) {
                 type::shared_from_this(),
                 payload,
                 lib::placeholders::_1
-            )    
+            )
         );
-    
+
         if (!m_ping_timer) {
             // Our transport doesn't support timers
             m_elog.write(log::elevel::warn,"Warning: a pong_timeout_handler is \
                 set but the transport in use does not support timeouts.");
         }
     }
-    
+
     bool needs_writing = false;
     {
         scoped_lock_type lock(m_write_lock);
@@ -193,7 +193,7 @@ void connection<config>::ping(const std::string& payload, lib::error_code& ec) {
             type::shared_from_this()
         ));
     }
-    
+
     ec = lib::error_code();
 }
 
@@ -207,7 +207,7 @@ void connection<config>::ping(const std::string& payload) {
 }
 
 template<typename config>
-void connection<config>::handle_pong_timeout(std::string payload, const lib::error_code & 
+void connection<config>::handle_pong_timeout(std::string payload, const lib::error_code &
     ec)
 {
     if (ec) {
@@ -215,11 +215,11 @@ void connection<config>::handle_pong_timeout(std::string payload, const lib::err
             // ignore, this is expected
             return;
         }
-        
+
         m_elog.write(log::elevel::devel,"pong_timeout error: "+ec.message());
         return;
     }
-    
+
     if (m_pong_timeout_handler) {
         m_pong_timeout_handler(m_connection_hdl,payload);
     }
@@ -233,7 +233,7 @@ void connection<config>::pong(const std::string& payload, lib::error_code& ec) {
         ec = error::make_error_code(error::invalid_state);
         return;
     }
-    
+
     message_ptr msg = m_msg_manager->get_message();
     if (!msg) {
         ec = error::make_error_code(error::no_outgoing_buffers);
@@ -242,7 +242,7 @@ void connection<config>::pong(const std::string& payload, lib::error_code& ec) {
 
     ec = m_processor->prepare_pong(payload,msg);
     if (ec) {return;}
-    
+
     bool needs_writing = false;
     {
         scoped_lock_type lock(m_write_lock);
@@ -270,8 +270,8 @@ void connection<config>::pong(const std::string& payload) {
 }
 
 template <typename config>
-void connection<config>::close(const close::status::value code, 
-    const std::string & reason, lib::error_code & ec) 
+void connection<config>::close(const close::status::value code,
+    const std::string & reason, lib::error_code & ec)
 {
     m_alog.write(log::alevel::devel,"connection close");
 
@@ -279,17 +279,17 @@ void connection<config>::close(const close::status::value code,
        ec = error::make_error_code(error::invalid_state);
        return;
     }
-    
+
     // Truncate reason to maximum size allowable in a close frame.
     std::string tr(reason,0,std::min<size_t>(reason.size(),
         frame::limits::close_reason_size));
-    
+
     ec = this->send_close_frame(code,tr,false,close::status::terminal(code));
 }
 
 template<typename config>
-void connection<config>::close(const close::status::value code, 
-    const std::string & reason) 
+void connection<config>::close(const close::status::value code,
+    const std::string & reason)
 {
     lib::error_code ec;
     close(code,reason,ec);
@@ -379,20 +379,20 @@ const std::string & connection<config>::get_subprotocol() const {
 }
 
 template <typename config>
-const std::vector<std::string> & 
+const std::vector<std::string> &
 connection<config>::get_requested_subprotocols() const {
     return m_requested_subprotocols;
 }
 
 template <typename config>
-void connection<config>::add_subprotocol(const std::string & value, 
+void connection<config>::add_subprotocol(const std::string & value,
     lib::error_code & ec)
 {
     if (m_is_server) {
         ec = error::make_error_code(error::client_only);
         return;
     }
-    
+
     // If the value is empty or has a non-RFC2616 token character it is invalid.
     if (value.empty() || std::find_if(value.begin(),value.end(),
                                       http::is_not_token_char) != value.end())
@@ -415,30 +415,30 @@ void connection<config>::add_subprotocol(const std::string & value) {
 
 
 template <typename config>
-void connection<config>::select_subprotocol(const std::string & value, 
+void connection<config>::select_subprotocol(const std::string & value,
     lib::error_code & ec)
 {
     if (!m_is_server) {
         ec = error::make_error_code(error::server_only);
         return;
     }
-    
+
     if (value.empty()) {
         ec = lib::error_code();
         return;
     }
-    
+
     std::vector<std::string>::iterator it;
-    
-    it = std::find(m_requested_subprotocols.begin(), 
-                   m_requested_subprotocols.end(), 
+
+    it = std::find(m_requested_subprotocols.begin(),
+                   m_requested_subprotocols.end(),
                    value);
-    
+
     if (it == m_requested_subprotocols.end()) {
         ec = error::make_error_code(error::unrequested_subprotocol);
         return;
     }
-    
+
     m_subprotocol = value;
 }
 
@@ -453,29 +453,29 @@ void connection<config>::select_subprotocol(const std::string & value) {
 
 
 template <typename config>
-const std::string & 
+const std::string &
 connection<config>::get_request_header(const std::string &key) {
     return m_request.get_header(key);
 }
 
 template <typename config>
-const std::string & 
+const std::string &
 connection<config>::get_response_header(const std::string &key) {
     return m_response.get_header(key);
 }
 
 template <typename config>
 void connection<config>::set_status(
-    http::status_code::value code) 
+    http::status_code::value code)
 {
     //scoped_lock_type lock(m_connection_state_lock);
-    
+
     if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
         throw error::make_error_code(error::invalid_state);
         //throw exception("Call to set_status from invalid state",
         //              error::INVALID_STATE);
     }
-    
+
     m_response.set_status(code);
 }
 template <typename config>
@@ -483,25 +483,25 @@ void connection<config>::set_status(
     http::status_code::value code, const std::string& msg)
 {
     //scoped_lock_type lock(m_connection_state_lock);
-    
+
     if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
         throw error::make_error_code(error::invalid_state);
         //throw exception("Call to set_status from invalid state",
         //              error::INVALID_STATE);
     }
-    
+
     m_response.set_status(code,msg);
 }
 template <typename config>
 void connection<config>::set_body(const std::string& value) {
     //scoped_lock_type lock(m_connection_state_lock);
-    
+
     if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
         throw error::make_error_code(error::invalid_state);
         //throw exception("Call to set_status from invalid state",
         //                error::INVALID_STATE);
     }
-    
+
     m_response.set_body(value);
 }
 template <typename config>
@@ -509,13 +509,13 @@ void connection<config>::append_header(
     const std::string &key, const std::string &val)
 {
     //scoped_lock_type lock(m_connection_state_lock);
-    
+
     if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
         throw error::make_error_code(error::invalid_state);
         //throw exception("Call to set_status from invalid state",
         //                error::INVALID_STATE);
     }
-    
+
     m_response.append_header(key,val);
 }
 template <typename config>
@@ -523,13 +523,13 @@ void connection<config>::replace_header(
     const std::string &key, const std::string &val)
 {
    // scoped_lock_type lock(m_connection_state_lock);
-    
+
     if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
         throw error::make_error_code(error::invalid_state);
         //throw exception("Call to set_status from invalid state",
         //                error::INVALID_STATE);
     }
-    
+
     m_response.replace_header(key,val);
 }
 template <typename config>
@@ -537,13 +537,13 @@ void connection<config>::remove_header(
     const std::string &key)
 {
     //scoped_lock_type lock(m_connection_state_lock);
-    
+
     if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
         throw error::make_error_code(error::invalid_state);
         //throw exception("Call to set_status from invalid state",
         //                error::INVALID_STATE);
     }
-    
+
     m_response.remove_header(key);
 }
 
@@ -557,15 +557,15 @@ void connection<config>::remove_header(
 template <typename config>
 void connection<config>::start() {
     m_alog.write(log::alevel::devel,"connection start");
-    
+
     this->atomic_state_change(
         istate::USER_INIT,
         istate::TRANSPORT_INIT,
         "Start must be called from user init state"
     );
-    
+
     // Depending on how the transport implements init this function may return
-    // immediately and call handle_transport_init later or call 
+    // immediately and call handle_transport_init later or call
     // handle_transport_init from this function.
     transport_con_type::init(
         lib::bind(
@@ -579,16 +579,16 @@ void connection<config>::start() {
 template <typename config>
 void connection<config>::handle_transport_init(lib::error_code const & ec) {
     m_alog.write(log::alevel::devel,"connection handle_transport_init");
-    
+
     {
         scoped_lock_type lock(m_connection_state_lock);
-    
+
         if (m_internal_state != istate::TRANSPORT_INIT) {
             throw error::make_error_code(error::invalid_state);
             //throw exception("handle_transport_init must be called from transport init state",
             //                error::INVALID_STATE);
         }
-        
+
         if (!ec) {
             // unless there was a transport error, advance internal state.
             if (m_is_server) {
@@ -598,7 +598,7 @@ void connection<config>::handle_transport_init(lib::error_code const & ec) {
             }
         }
     }
-    
+
     if (ec) {
         std::stringstream s;
         s << "handle_transport_init recieved error: "<< ec.message();
@@ -607,7 +607,7 @@ void connection<config>::handle_transport_init(lib::error_code const & ec) {
         this->terminate(ec);
         return;
     }
-    
+
     // At this point the transport is ready to read and write bytes.
     if (m_is_server) {
         this->read_handshake(1);
@@ -622,16 +622,16 @@ void connection<config>::handle_transport_init(lib::error_code const & ec) {
 template <typename config>
 void connection<config>::read_handshake(size_t num_bytes) {
     m_alog.write(log::alevel::devel,"connection read");
-    
+
     m_handshake_timer = transport_con_type::set_timer(
         config::timeout_open_handshake,
         lib::bind(
             &type::handle_open_handshake_timeout,
             type::shared_from_this(),
             lib::placeholders::_1
-        )    
+        )
     );
-    
+
     transport_con_type::async_read_at_least(
         num_bytes,
         m_buf,
@@ -645,19 +645,19 @@ void connection<config>::read_handshake(size_t num_bytes) {
     );
 }
 
-// All exit paths for this function need to call send_http_response() or submit 
+// All exit paths for this function need to call send_http_response() or submit
 // a new read request with this function as the handler.
 template <typename config>
-void connection<config>::handle_read_handshake(const lib::error_code& ec, 
+void connection<config>::handle_read_handshake(const lib::error_code& ec,
     size_t bytes_transferred)
 {
     m_alog.write(log::alevel::devel,"connection handle_read_handshake");
-    
+
     this->atomic_state_check(
         istate::READ_HTTP_REQUEST,
         "handle_read_handshake must be called from READ_HTTP_REQUEST state"
     );
-    
+
     if (ec) {
         if (ec == transport::error::eof) {
             // we expect to get eof if the connection is closed already
@@ -666,53 +666,53 @@ void connection<config>::handle_read_handshake(const lib::error_code& ec,
                 return;
             }
         }
-        
+
         std::stringstream s;
         s << "error in handle_read_handshake: "<< ec.message();
         m_elog.write(log::elevel::fatal,s.str());
         this->terminate(ec);
         return;
     }
-            
+
     // Boundaries checking. TODO: How much of this should be done?
     if (bytes_transferred > config::connection_read_buffer_size) {
         m_elog.write(log::elevel::fatal,"Fatal boundaries checking error.");
         this->terminate(make_error_code(error::general));
         return;
     }
-    
+
     size_t bytes_processed = 0;
     try {
         bytes_processed = m_request.consume(m_buf,bytes_transferred);
     } catch (http::exception &e) {
-        // All HTTP exceptions will result in this request failing and an error 
+        // All HTTP exceptions will result in this request failing and an error
         // response being returned. No more bytes will be read in this con.
         m_response.set_status(e.m_error_code,e.m_error_msg);
         this->send_http_response_error();
         return;
     }
-    
-    // More paranoid boundaries checking. 
+
+    // More paranoid boundaries checking.
     // TODO: Is this overkill?
     if (bytes_processed > config::connection_read_buffer_size) {
         m_elog.write(log::elevel::fatal,"Fatal boundaries checking error.");
         this->terminate(make_error_code(error::general));
         return;
     }
-    
+
     if (m_alog.static_test(log::alevel::devel)) {
         std::stringstream s;
-        s << "bytes_transferred: " << bytes_transferred 
+        s << "bytes_transferred: " << bytes_transferred
           << " bytes, bytes processed: " << bytes_processed << " bytes";
         m_alog.write(log::alevel::devel,s.str());
     }
-    
+
     if (m_request.ready()) {
         if (!this->initialize_processor()) {
             this->send_http_response_error();
             return;
         }
-        
+
         if (m_processor && m_processor->get_version() == 0) {
             // Version 00 has an extra requirement to read some bytes after the
             // handshake
@@ -730,7 +730,7 @@ void connection<config>::handle_read_handshake(const lib::error_code& ec,
                 return;
             }
         }
-        
+
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,m_request.raw());
             if (m_request.get_header("Sec-WebSocket-Key3") != "") {
@@ -738,19 +738,19 @@ void connection<config>::handle_read_handshake(const lib::error_code& ec,
                     utility::to_hex(m_request.get_header("Sec-WebSocket-Key3")));
             }
         }
-        
-        // The remaining bytes in m_buf are frame data. Copy them to the 
+
+        // The remaining bytes in m_buf are frame data. Copy them to the
         // beginning of the buffer and note the length. They will be read after
         // the handshake completes and before more bytes are read.
         std::copy(m_buf+bytes_processed,m_buf+bytes_transferred,m_buf);
         m_buf_cursor = bytes_transferred-bytes_processed;
-        
+
         this->atomic_state_change(
             istate::READ_HTTP_REQUEST,
             istate::PROCESS_HTTP_REQUEST,
             "send_http_response must be called from READ_HTTP_REQUEST state"
         );
-        
+
         // We have the complete request. Process it.
         this->process_handshake_request();
         this->send_http_response();
@@ -785,19 +785,19 @@ void connection<config>::send_http_response_error() {
     this->send_http_response();
 }
 
-// All exit paths for this function need to call send_http_response() or submit 
+// All exit paths for this function need to call send_http_response() or submit
 // a new read request with this function as the handler.
 template <typename config>
-void connection<config>::handle_read_frame(const lib::error_code& ec, 
+void connection<config>::handle_read_frame(const lib::error_code& ec,
     size_t bytes_transferred)
 {
     //m_alog.write(log::alevel::devel,"connection handle_read_frame");
-    
+
     this->atomic_state_check(
         istate::PROCESS_CONNECTION,
         "handle_read_frame must be called from PROCESS_CONNECTION state"
     );
-    
+
     if (ec) {
         if (ec == transport::error::eof) {
             if (m_state == session::state::closed) {
@@ -806,7 +806,7 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
                 m_alog.write(log::alevel::devel,"got eof from closed con");
                 return;
             } else if (m_state == session::state::closing && !m_is_server) {
-                // If we are a client we expect to get eof in the closing state, 
+                // If we are a client we expect to get eof in the closing state,
                 // this is a signal to terminate our end of the connection after
                 // the closing handshake
                 terminate(lib::error_code());
@@ -818,36 +818,36 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
 			this->terminate(ec);
 			return;
         }
-        
+
         std::stringstream s;
         s << "error in handle_read_frame: " << ec.message() << " (" << ec << ")";
         m_elog.write(log::elevel::fatal,s.str());
         this->terminate(ec);
         return;
     }
-    
+
     // Boundaries checking. TODO: How much of this should be done?
     if (bytes_transferred > config::connection_read_buffer_size) {
         m_elog.write(log::elevel::fatal,"Fatal boundaries checking error");
         this->terminate(make_error_code(error::general));
         return;
     }
-    
+
     size_t p = 0;
-    
+
     if (m_alog.static_test(log::alevel::devel)) {
         std::stringstream s;
         s << "p = " << p << " bytes transferred = " << bytes_transferred;
         m_alog.write(log::alevel::devel,s.str());
     }
-    
+
     while (p < bytes_transferred) {
         if (m_alog.static_test(log::alevel::devel)) {
             std::stringstream s;
             s << "calling consume with " << bytes_transferred-p << " bytes";
             m_alog.write(log::alevel::devel,s.str());
         }
-        
+
         lib::error_code ec;
 
         p += m_processor->consume(
@@ -855,7 +855,7 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
             bytes_transferred-p,
             ec
         );
-        
+
         if (m_alog.static_test(log::alevel::devel)) {
             std::stringstream s;
             s << "bytes left after consume: " << bytes_transferred-p;
@@ -863,7 +863,7 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
         }
         if (ec) {
             m_elog.write(log::elevel::rerror,"consume error: "+ec.message());
-            
+
             if (config::drop_on_protocol_error) {
                 this->terminate(ec);
                 return;
@@ -888,9 +888,9 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
                 s << "Complete frame received. Dispatching";
                 m_alog.write(log::alevel::devel,s.str());
             }
-            
+
             message_ptr msg = m_processor->get_message();
-           
+
             if (!msg) {
                 m_alog.write(log::alevel::devel,
                     "null message from m_processor");
@@ -907,12 +907,12 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
             }
         }
     }
-    
+
     transport_con_type::async_read_at_least(
         // std::min wont work with undefined static const values.
         // TODO: is there a more elegant way to do this?
-        // Need to determine if requesting 1 byte or the exact number of bytes 
-        // is better here. 1 byte lets us be a bit more responsive at a 
+        // Need to determine if requesting 1 byte or the exact number of bytes
+        // is better here. 1 byte lets us be a bit more responsive at a
         // potential expense of additional runs through handle_read_frame
         /*(m_processor->get_bytes_needed() > config::connection_read_buffer_size ?
          config::connection_read_buffer_size : m_processor->get_bytes_needed())*/
@@ -931,23 +931,23 @@ void connection<config>::handle_read_frame(const lib::error_code& ec,
 template <typename config>
 bool connection<config>::initialize_processor() {
     m_alog.write(log::alevel::devel,"initialize_processor");
-    
+
     // if it isn't a websocket handshake nothing to do.
     if (!processor::is_websocket_handshake(m_request)) {
         return true;
     }
-    
+
     int version = processor::get_websocket_version(m_request);
-    
+
     if (version < 0) {
         m_alog.write(log::alevel::devel,
             "BAD REQUEST: can't determine version");
         m_response.set_status(http::status_code::bad_request);
         return false;
     }
-    
+
     m_processor = get_processor(version);
-    
+
     // if the processor is not null we are done
     if (m_processor) {
         return true;
@@ -958,7 +958,7 @@ bool connection<config>::initialize_processor() {
     m_alog.write(log::alevel::devel,
         "BAD REQUEST: no processor for version");
     m_response.set_status(http::status_code::bad_request);
-    
+
     std::stringstream ss;
     std::string sep = "";
     std::vector<int>::const_iterator it;
@@ -967,7 +967,7 @@ bool connection<config>::initialize_processor() {
         ss << sep << *it;
         sep = ",";
     }
-    
+
     m_response.replace_header("Sec-WebSocket-Version",ss.str());
     return false;
 }
@@ -975,24 +975,24 @@ bool connection<config>::initialize_processor() {
 template <typename config>
 bool connection<config>::process_handshake_request() {
     m_alog.write(log::alevel::devel,"process handshake request");
-    
+
     if (!processor::is_websocket_handshake(m_request)) {
         // this is not a websocket handshake. Process as plain HTTP
         m_alog.write(log::alevel::devel,"HTTP REQUEST");
-        
+
         // extract URI from request
         m_uri = processor::get_uri_from_host(
             m_request,
             (transport_con_type::is_secure() ? "https" : "http")
         );
-        
+
         if (!m_uri->get_valid()) {
             m_alog.write(log::alevel::devel,
                 std::string("Bad request: failed to parse uri"));
             m_response.set_status(http::status_code::bad_request);
             return false;
         }
-        
+
         if (m_http_handler) {
             m_http_handler(m_connection_hdl);
         } else {
@@ -1001,7 +1001,7 @@ bool connection<config>::process_handshake_request() {
 
         return true;
     }
-    
+
     lib::error_code ec = m_processor->validate_handshake(m_request);
 
     // Validate: make sure all required elements are present.
@@ -1012,12 +1012,12 @@ bool connection<config>::process_handshake_request() {
         m_response.set_status(http::status_code::bad_request);
         return false;
     }
-    
+
     // Read extension parameters and set up values necessary for the end user
     // to complete extension negotiation.
     std::pair<lib::error_code,std::string> neg_results;
     neg_results = m_processor->negotiate_extensions(m_request);
-    
+
     if (neg_results.first) {
         // There was a fatal error in extension parsing that should result in
         // a failed connection attempt.
@@ -1036,7 +1036,7 @@ bool connection<config>::process_handshake_request() {
     }
 
     // extract URI from request
-    m_uri = m_processor->get_uri(m_request);    
+    m_uri = m_processor->get_uri(m_request);
 
 
     if (!m_uri->get_valid()) {
@@ -1045,20 +1045,20 @@ bool connection<config>::process_handshake_request() {
         m_response.set_status(http::status_code::bad_request);
         return false;
     }
-    
+
     // extract subprotocols
     lib::error_code subp_ec = m_processor->extract_subprotocols(m_request,
         m_requested_subprotocols);
-    
+
     if (subp_ec) {
         // should we do anything?
     }
-    
+
     // Ask application to validate the connection
     if (!m_validate_handler || m_validate_handler(m_connection_hdl)) {
         m_response.set_status(http::status_code::switching_protocols);
-        
-        // Write the appropriate response headers based on request and 
+
+        // Write the appropriate response headers based on request and
         // processor version
         ec = m_processor->process_handshake(m_request,m_subprotocol,m_response);
 
@@ -1073,30 +1073,30 @@ bool connection<config>::process_handshake_request() {
     } else {
         // User application has rejected the handshake
         m_alog.write(log::alevel::devel,"USER REJECT");
-        
-        // Use Bad Request if the user handler did not provide a more 
+
+        // Use Bad Request if the user handler did not provide a more
         // specific http response error code.
         // TODO: is there a better default?
         if (m_response.get_status_code() == http::status_code::uninitialized) {
             m_response.set_status(http::status_code::bad_request);
         }
-        
+
         return false;
     }
-    
+
     return true;
-} 
+}
 
 template <typename config>
 void connection<config>::send_http_response() {
     m_alog.write(log::alevel::devel,"connection send_http_response");
-    
+
     if (m_response.get_status_code() == http::status_code::uninitialized) {
         m_response.set_status(http::status_code::internal_server_error);
     }
-    
+
     m_response.set_version("HTTP/1.1");
-    
+
     // Set server header based on the user agent settings
     if (m_response.get_header("Server") == "") {
         if (!m_user_agent.empty()) {
@@ -1105,7 +1105,7 @@ void connection<config>::send_http_response() {
             m_response.remove_header("Server");
         }
     }
-    
+
     // have the processor generate the raw bytes for the wire (if it exists)
     if (m_processor) {
         m_handshake_buffer = m_processor->get_raw(m_response);
@@ -1113,7 +1113,7 @@ void connection<config>::send_http_response() {
         // a processor wont exist for raw HTTP responses.
         m_handshake_buffer = m_response.raw();
     }
-    
+
     if (m_alog.static_test(log::alevel::devel)) {
         m_alog.write(log::alevel::devel,"Raw Handshake response:\n"+m_handshake_buffer);
         if (m_response.get_header("Sec-WebSocket-Key3") != "") {
@@ -1121,7 +1121,7 @@ void connection<config>::send_http_response() {
                 utility::to_hex(m_response.get_header("Sec-WebSocket-Key3")));
         }
     }
-    
+
     // write raw bytes
     transport_con_type::async_write(
         m_handshake_buffer.data(),
@@ -1139,42 +1139,42 @@ void connection<config>::handle_send_http_response(
     const lib::error_code& ec)
 {
     m_alog.write(log::alevel::devel,"handle_send_http_response");
-    
+
     this->atomic_state_check(
         istate::PROCESS_HTTP_REQUEST,
         "handle_send_http_response must be called from PROCESS_HTTP_REQUEST state"
     );
-    
+
     if (ec) {
         m_elog.write(log::elevel::rerror,
             "error in handle_send_http_response: "+ec.message());
         this->terminate(ec);
         return;
     }
-    
+
     this->log_open_result();
-    
-    if (m_response.get_status_code() != http::status_code::switching_protocols) 
+
+    if (m_response.get_status_code() != http::status_code::switching_protocols)
     {
         if (m_processor) {
-            // if this was not a websocket connection, we have written 
+            // if this was not a websocket connection, we have written
             // the expected response and the connection can be closed.
         } else {
             // this was a websocket connection that ended in an error
             std::stringstream s;
-            s << "Handshake ended with HTTP error: " 
+            s << "Handshake ended with HTTP error: "
               << m_response.get_status_code();
             m_elog.write(log::elevel::rerror,s.str());
         }
         this->terminate(make_error_code(error::http_connection_ended));
         return;
     }
-    
+
     if (m_handshake_timer) {
         m_handshake_timer->cancel();
         m_handshake_timer.reset();
     }
-    
+
     this->atomic_state_change(
         istate::PROCESS_HTTP_REQUEST,
         istate::PROCESS_CONNECTION,
@@ -1182,7 +1182,7 @@ void connection<config>::handle_send_http_response(
         session::state::open,
         "handle_send_http_response must be called from PROCESS_HTTP_REQUEST state"
     );
-    
+
     if (m_open_handler) {
         m_open_handler(m_connection_hdl);
     }
@@ -1193,16 +1193,16 @@ void connection<config>::handle_send_http_response(
 template <typename config>
 void connection<config>::send_http_request() {
     m_alog.write(log::alevel::devel,"connection send_http_request");
-    
+
     // TODO: origin header?
-        
+
     // Have the protocol processor fill in the appropriate fields based on the
     // selected client version
     if (m_processor) {
         lib::error_code ec;
         ec = m_processor->client_handshake_request(m_request,m_uri,
             m_requested_subprotocols);
-        
+
         if (ec) {
             m_elog.write(log::elevel::fatal,
                 "Internal library error: processor error: "+ec.message());
@@ -1213,7 +1213,7 @@ void connection<config>::send_http_request() {
             "Internal library error: missing processor");
         return;
     }
-    
+
     // Unless the user has overridden the user agent, send generic WS++ UA.
     if (m_request.get_header("User-Agent") == "") {
         if (!m_user_agent.empty()) {
@@ -1222,23 +1222,23 @@ void connection<config>::send_http_request() {
             m_request.remove_header("User-Agent");
         }
     }
-        
+
     m_handshake_buffer = m_request.raw();
-    
+
     if (m_alog.static_test(log::alevel::devel)) {
         m_alog.write(log::alevel::devel,
             "Raw Handshake request:\n"+m_handshake_buffer);
     }
-    
+
     m_handshake_timer = transport_con_type::set_timer(
         config::timeout_open_handshake,
         lib::bind(
             &type::handle_open_handshake_timeout,
             type::shared_from_this(),
             lib::placeholders::_1
-        )    
+        )
     );
-    
+
     transport_con_type::async_write(
         m_handshake_buffer.data(),
         m_handshake_buffer.size(),
@@ -1253,25 +1253,25 @@ void connection<config>::send_http_request() {
 template <typename config>
 void connection<config>::handle_send_http_request(const lib::error_code& ec) {
     m_alog.write(log::alevel::devel,"handle_send_http_request");
-    
+
     this->atomic_state_check(
         istate::WRITE_HTTP_REQUEST,
         "handle_send_http_request must be called from WRITE_HTTP_REQUEST state"
     );
-    
+
     if (ec) {
         m_elog.write(log::elevel::rerror,
             "error in handle_send_http_request: "+ec.message());
         this->terminate(ec);
         return;
     }
-        
+
     this->atomic_state_change(
         istate::WRITE_HTTP_REQUEST,
         istate::READ_HTTP_RESPONSE,
         "handle_send_http_request must be called from WRITE_HTTP_REQUEST state"
     );
-    
+
     transport_con_type::async_read_at_least(
         1,
         m_buf,
@@ -1290,12 +1290,12 @@ void connection<config>::handle_read_http_response(const lib::error_code& ec,
     size_t bytes_transferred)
 {
     m_alog.write(log::alevel::devel,"handle_read_http_response");
-    
+
     this->atomic_state_check(
         istate::READ_HTTP_RESPONSE,
         "handle_read_http_response must be called from READ_HTTP_RESPONSE state"
     );
-    
+
     if (ec) {
         m_elog.write(log::elevel::rerror,
             "error in handle_read_http_response: "+ec.message());
@@ -1312,9 +1312,9 @@ void connection<config>::handle_read_http_response(const lib::error_code& ec,
         this->terminate(make_error_code(error::general));
         return;
     }
-    
+
     m_alog.write(log::alevel::devel,std::string("Raw response: ")+m_response.raw());
-    
+
     if (m_response.headers_ready()) {
         lib::error_code ec = m_processor->validate_server_handshake_response(
             m_request,
@@ -1337,24 +1337,24 @@ void connection<config>::handle_read_http_response(const lib::error_code& ec,
             session::state::open,
             "handle_read_http_response must be called from READ_HTTP_RESPONSE state"
         );
-        
+
         if (m_handshake_timer) {
             m_handshake_timer->cancel();
             m_handshake_timer.reset();
         }
 
         this->log_open_result();
-        
+
         if (m_open_handler) {
             m_open_handler(m_connection_hdl);
         }
 
-        // The remaining bytes in m_buf are frame data. Copy them to the 
+        // The remaining bytes in m_buf are frame data. Copy them to the
         // beginning of the buffer and note the length. They will be read after
         // the handshake completes and before more bytes are read.
         std::copy(m_buf+bytes_processed,m_buf+bytes_transferred,m_buf);
         m_buf_cursor = bytes_transferred-bytes_processed;
-        
+
         this->handle_read_frame(lib::error_code(), m_buf_cursor);
     } else {
         transport_con_type::async_read_at_least(
@@ -1423,7 +1423,7 @@ void connection<config>::terminate(const lib::error_code & ec) {
         m_local_close_code = close::status::abnormal_close;
         m_local_close_reason = ec.message();
     }
-    
+
     if (m_state == session::state::connecting) {
         m_state = session::state::closed;
         tstat = failed;
@@ -1435,7 +1435,7 @@ void connection<config>::terminate(const lib::error_code & ec) {
             "terminate called on connection that was already terminated");
         return;
     }
-    
+
     transport_con_type::async_shutdown(
         lib::bind(
             &type::handle_terminate,
@@ -1453,12 +1453,12 @@ void connection<config>::handle_terminate(terminate_status tstat,
     if (m_alog.static_test(log::alevel::devel)) {
         m_alog.write(log::alevel::devel,"connection handle_terminate");
     }
-    
+
     if (ec) {
         // there was an error actually shutting down the connection
         m_elog.write(log::elevel::rerror,ec.message());
     }
-    
+
     // clean shutdown
     if (tstat == failed) {
         if (m_fail_handler) {
@@ -1473,9 +1473,9 @@ void connection<config>::handle_terminate(terminate_status tstat,
     } else {
         m_elog.write(log::elevel::rerror,"Unknown terminate_status");
     }
-    
+
     // call the termination handler if it exists
-    // if it exists it might (but shouldn't) refer to a bad memory location. 
+    // if it exists it might (but shouldn't) refer to a bad memory location.
     // If it does, we don't care and should catch and ignore it.
     if (m_termination_handler) {
         try {
@@ -1491,10 +1491,10 @@ void connection<config>::handle_terminate(terminate_status tstat,
 template <typename config>
 void connection<config>::write_frame() {
     //m_alog.write(log::alevel::devel,"connection write_frame");
-    
+
     {
         scoped_lock_type lock(m_write_lock);
-        
+
         // Check the write flag. If true, there is an outstanding transport
         // write already. In this case we just return. The write handler will
         // start a new write if the write queue isn't empty. If false, we set
@@ -1502,16 +1502,16 @@ void connection<config>::write_frame() {
         if (m_write_flag) {
             return;
         }
-        
+
         // Get the next message in the queue. This will return an empty
         // message if the queue was empty.
         m_current_msg = write_pop();
-        
+
         if (!m_current_msg) {
             return;
         }
-        
-        // At this point we own the next message to be sent and are 
+
+        // At this point we own the next message to be sent and are
         // responsible for holding the write flag until it is successfully
         // sent or there is some error
         m_write_flag = true;
@@ -1522,13 +1522,13 @@ void connection<config>::write_frame() {
 
     m_send_buffer.push_back(transport::buffer(header.c_str(),header.size()));
     m_send_buffer.push_back(transport::buffer(payload.c_str(),payload.size()));
-    
-    
+
+
     if (m_alog.static_test(log::alevel::frame_header)) {
     if (m_alog.dynamic_test(log::alevel::frame_header)) {
         std::stringstream s;
-        s << "Dispatching write with " << header.size() 
-          << " header bytes and " << payload.size() 
+        s << "Dispatching write with " << header.size()
+          << " header bytes and " << payload.size()
           << " payload bytes" << std::endl;
         m_alog.write(log::alevel::frame_header,s.str());
         m_alog.write(log::alevel::frame_header,"Header: "+utility::to_hex(header));
@@ -1539,7 +1539,7 @@ void connection<config>::write_frame() {
         m_alog.write(log::alevel::frame_payload,"Payload: "+utility::to_hex(payload));
     }
     }
-    
+
     transport_con_type::async_write(
         m_send_buffer,
         lib::bind(
@@ -1552,7 +1552,7 @@ void connection<config>::write_frame() {
 }
 
 template <typename config>
-void connection<config>::handle_write_frame(bool terminate, 
+void connection<config>::handle_write_frame(bool terminate,
     const lib::error_code& ec)
 {
     if (m_alog.static_test(log::alevel::devel)) {
@@ -1576,10 +1576,10 @@ void connection<config>::handle_write_frame(bool terminate,
     bool needs_writing = false;
     {
         scoped_lock_type lock(m_write_lock);
-        
+
         // release write flag
         m_write_flag = false;
-        
+
         needs_writing = !m_send_queue.empty();
     }
 
@@ -1592,7 +1592,7 @@ void connection<config>::handle_write_frame(bool terminate,
 }
 
 template <typename config>
-void connection<config>::atomic_state_change(istate_type req, 
+void connection<config>::atomic_state_change(istate_type req,
     istate_type dest, std::string msg)
 {
     scoped_lock_type lock(m_connection_state_lock);
@@ -1601,13 +1601,13 @@ void connection<config>::atomic_state_change(istate_type req,
         throw error::make_error_code(error::invalid_state);
         //throw exception(msg,error::INVALID_STATE);
     }
-    
+
     m_internal_state = dest;
 }
 
 template <typename config>
 void connection<config>::atomic_state_change(
-    istate_type internal_req, istate_type internal_dest, 
+    istate_type internal_req, istate_type internal_dest,
     session::state::value external_req, session::state::value external_dest,
     std::string msg)
 {
@@ -1617,7 +1617,7 @@ void connection<config>::atomic_state_change(
         throw error::make_error_code(error::invalid_state);
         //throw exception(msg,error::INVALID_STATE);
     }
-    
+
     m_internal_state = internal_dest;
     m_state = external_dest;
 }
@@ -1641,18 +1641,18 @@ const std::vector<int>& connection<config>::get_supported_versions() const
 }
 
 template <typename config>
-void connection<config>::process_control_frame(typename 
+void connection<config>::process_control_frame(typename
     config::message_type::ptr msg)
 {
     m_alog.write(log::alevel::devel,"process_control_frame");
 
     frame::opcode::value op = msg->get_opcode();
     lib::error_code ec;
-    
+
     std::stringstream s;
     s << "Control frame received with opcode " << op;
     m_alog.write(log::alevel::control,s.str());
-    
+
     if (m_state == session::state::closed) {
         m_elog.write(log::elevel::warn,"got frame in state closed");
         return;
@@ -1661,10 +1661,10 @@ void connection<config>::process_control_frame(typename
         m_elog.write(log::elevel::warn,"got non-close frame in state closing");
         return;
     }
-    
+
     if (op == frame::opcode::PING) {
         bool pong = true;
-        
+
         if (m_ping_handler) {
             pong = m_ping_handler(m_connection_hdl, msg->get_payload());
         }
@@ -1686,7 +1686,7 @@ void connection<config>::process_control_frame(typename
     } else if (op == frame::opcode::CLOSE) {
         m_alog.write(log::alevel::devel,"got close frame");
         // record close code and reason somewhere
-        
+
         m_remote_close_code = close::extract_code(msg->get_payload(),ec);
         if (ec) {
             std::stringstream s;
@@ -1708,7 +1708,7 @@ void connection<config>::process_control_frame(typename
             }
             return;
         }
-        
+
         m_remote_close_reason = close::extract_reason(msg->get_payload(),ec);
         if (ec) {
             if (config::drop_on_protocol_error) {
@@ -1730,10 +1730,10 @@ void connection<config>::process_control_frame(typename
 
         if (m_state == session::state::open) {
             std::stringstream s;
-            s << "Received close frame with code " << m_remote_close_code 
+            s << "Received close frame with code " << m_remote_close_code
               << " and reason " << m_remote_close_reason;
             m_alog.write(log::alevel::devel,s.str());
-            
+
             ec = send_close_ack();
             if (ec) {
                 m_elog.write(log::elevel::devel,
@@ -1742,15 +1742,15 @@ void connection<config>::process_control_frame(typename
         } else if (m_state == session::state::closing && !m_was_clean) {
             // ack of our close
             m_alog.write(log::alevel::devel,"Got acknowledgement of close");
-            
+
             m_was_clean = true;
-            
+
             // If we are a server terminate the connection now. Clients should
             // leave the connection open to give the server an opportunity to
             // initiate the TCP close. The client's timer will handle closing
             // its side of the connection if the server misbehaves.
             //
-            // TODO: different behavior if the underlying transport doesn't 
+            // TODO: different behavior if the underlying transport doesn't
             // support timers?
             if (m_is_server) {
                 terminate(lib::error_code());
@@ -1783,7 +1783,7 @@ lib::error_code connection<config>::send_close_frame(close::status::value code,
     // parameters specifies close::status::blank then determine what to do
     // based on whether or not this is an ack. If it is not an ack just
     // send blank info. If it is an ack then echo the close information from
-    // the remote endpoint. 
+    // the remote endpoint.
     if (config::silent_close) {
         m_alog.write(log::alevel::devel,"closing silently");
         m_local_close_code = close::status::no_status;
@@ -1806,12 +1806,12 @@ lib::error_code connection<config>::send_close_frame(close::status::value code,
         m_local_close_code = m_remote_close_code;
         m_local_close_reason = m_remote_close_reason;
     }
-    
+
     std::stringstream s;
     s << "Closing with code: " << m_local_close_code << ", and reason: "
       << m_local_close_reason;
     m_alog.write(log::alevel::devel,s.str());
-    
+
     message_ptr msg = m_msg_manager->get_message();
     if (!msg) {
         return error::make_error_code(error::no_outgoing_buffers);
@@ -1822,21 +1822,21 @@ lib::error_code connection<config>::send_close_frame(close::status::value code,
     if (ec) {
         return ec;
     }
-    
+
     // Messages flagged terminal will result in the TCP connection being dropped
-    // after the message has been written. This is typically used when servers 
+    // after the message has been written. This is typically used when servers
     // send an ack and when any endpoint encounters a protocol error
     if (terminal) {
         msg->set_terminal(true);
     }
-    
+
     m_state = session::state::closing;
-    
+
     if (ack) {
         m_was_clean = true;
     }
-    
-    // Start a timer so we don't wait forever for the acknowledgement close 
+
+    // Start a timer so we don't wait forever for the acknowledgement close
     // frame
     m_handshake_timer = transport_con_type::set_timer(
         config::timeout_close_handshake,
@@ -1844,16 +1844,16 @@ lib::error_code connection<config>::send_close_frame(close::status::value code,
             &type::handle_close_handshake_timeout,
             type::shared_from_this(),
             lib::placeholders::_1
-        )    
+        )
     );
-    
+
     bool needs_writing = false;
     {
         scoped_lock_type lock(m_write_lock);
         write_push(msg);
         needs_writing = !m_write_flag && !m_send_queue.empty();
     }
-    
+
     if (needs_writing) {
         transport_con_type::dispatch(lib::bind(
             &type::write_frame,
@@ -1919,10 +1919,10 @@ void connection<config>::write_push(typename config::message_type::ptr msg)
     if (!msg) {
         return;
     }
-    
+
     m_send_buffer_size += msg->get_payload().size();
     m_send_queue.push(msg);
-    
+
     std::stringstream s;
     s << "write_push: message count: " << m_send_queue.size()
       << " buffer size: " << m_send_buffer_size;
@@ -1933,16 +1933,16 @@ template <typename config>
 typename config::message_type::ptr connection<config>::write_pop()
 {
     message_ptr msg;
-    
+
     if (m_send_queue.empty()) {
         return msg;
     }
-    
+
     msg = m_send_queue.front();
-    
+
     m_send_buffer_size -= msg->get_payload().size();
     m_send_queue.pop();
-    
+
     std::stringstream s;
     s << "write_pop: message count: " << m_send_queue.size()
       << " buffer size: " << m_send_buffer_size;
@@ -1954,25 +1954,25 @@ template <typename config>
 void connection<config>::log_open_result()
 {
     std::stringstream s;
-    
+
     int version;
     if (!processor::is_websocket_handshake(m_request)) {
         version = -1;
     } else {
         version = processor::get_websocket_version(m_request);
     }
-    
+
     // Connection Type
     s << (version == -1 ? "HTTP" : "WebSocket") << " Connection ";
-    
+
     // Remote endpoint address
     s << transport_con_type::get_remote_endpoint() << " ";
-    
+
     // Version string if WebSocket
     if (version != -1) {
         s << "v" << version << " ";
     }
-    
+
     // User Agent
     std::string ua = m_request.get_header("User-Agent");
     if (ua == "") {
@@ -1981,13 +1981,13 @@ void connection<config>::log_open_result()
         // check if there are any quotes in the user agent
         s << "\"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
     }
-        
+
     // URI
     s << (m_uri ? m_uri->get_resource() : "NULL") << " ";
-    
+
     // Status code
     s << m_response.get_status_code();
-    
+
     m_alog.write(log::alevel::connect,s.str());
 }
 
@@ -1995,13 +1995,13 @@ template <typename config>
 void connection<config>::log_close_result()
 {
     std::stringstream s;
-    
+
     s << "Disconnect "
-      << "close local:[" << m_local_close_code 
-      << (m_local_close_reason == "" ? "" : ","+m_local_close_reason) 
+      << "close local:[" << m_local_close_code
+      << (m_local_close_reason == "" ? "" : ","+m_local_close_reason)
       << "] remote:[" << m_remote_close_code
       << (m_remote_close_reason == "" ? "" : ","+m_remote_close_reason) << "]";
-    
+
     m_alog.write(log::alevel::disconnect,s.str());
 }
 
diff --git a/websocketpp/impl/endpoint_impl.hpp b/websocketpp/impl/endpoint_impl.hpp
index 02712fec7a..045a6bb9a8 100644
--- a/websocketpp/impl/endpoint_impl.hpp
+++ b/websocketpp/impl/endpoint_impl.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_ENDPOINT_IMPL_HPP
@@ -35,17 +35,17 @@ typename endpoint<connection,config>::connection_ptr
 endpoint<connection,config>::create_connection() {
     m_alog.write(log::alevel::devel,"create_connection");
     //scoped_lock_type lock(m_state_lock);
-    
+
     /*if (m_state == STOPPING || m_state == STOPPED) {
         return connection_ptr();
     }*/
-    
+
     // Create a connection on the heap and manage it using a shared pointer
     connection_ptr con(new connection_type(m_is_server,m_user_agent,m_alog,
         m_elog, m_rng));
-    
+
     connection_weak_ptr w(con);
-    
+
     // Create a weak pointer on the heap using that shared_ptr.
     // Cast that weak pointer to void* and manage it using another shared_ptr
     // connection_hdl hdl(reinterpret_cast<void*>(new connection_weak_ptr(con)));
@@ -54,7 +54,7 @@ endpoint<connection,config>::create_connection() {
 
     //
     con->set_handle(w);
-    
+
     // Copy default handlers from the endpoint
     con->set_open_handler(m_open_handler);
     con->set_close_handler(m_close_handler);
@@ -66,7 +66,7 @@ endpoint<connection,config>::create_connection() {
     con->set_http_handler(m_http_handler);
     con->set_validate_handler(m_validate_handler);
     con->set_message_handler(m_message_handler);
-    
+
     con->set_termination_handler(
         lib::bind(
             &type::remove_connection,
@@ -74,30 +74,30 @@ endpoint<connection,config>::create_connection() {
             lib::placeholders::_1
         )
     );
-    
+
     lib::error_code ec;
-    
+
     ec = transport_type::init(con);
     if (ec) {
         m_elog.write(log::elevel::fatal,ec.message());
         return connection_ptr();
     }
-    
+
     scoped_lock_type lock(m_mutex);
     m_connections.insert(con);
-    
+
     return con;
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::interrupt(connection_hdl hdl, 
+void endpoint<connection,config>::interrupt(connection_hdl hdl,
     lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
     if (ec) {return;}
-    
+
     m_alog.write(log::alevel::devel,"Interrupting connection"+con.get());
-    
+
     ec = con->interrupt();
 }
 
@@ -109,7 +109,7 @@ void endpoint<connection,config>::interrupt(connection_hdl hdl) {
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, std::string const & 
+void endpoint<connection,config>::send(connection_hdl hdl, std::string const &
     payload, frame::opcode::value op, lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
@@ -119,7 +119,7 @@ void endpoint<connection,config>::send(connection_hdl hdl, std::string const &
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, std::string const & 
+void endpoint<connection,config>::send(connection_hdl hdl, std::string const &
     payload, frame::opcode::value op)
 {
     lib::error_code ec;
@@ -146,7 +146,7 @@ void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg, 
+void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg,
     lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
@@ -163,14 +163,14 @@ void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg) {
 
 template <typename connection, typename config>
 void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
-    const code, std::string const & reason, 
+    const code, std::string const & reason,
     lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
     if (ec) {return;}
     con->close(code,reason,ec);
 }
-    
+
 template <typename connection, typename config>
 void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
     const code, std::string const & reason)
@@ -181,16 +181,16 @@ void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::ping(connection_hdl hdl, std::string const & 
+void endpoint<connection,config>::ping(connection_hdl hdl, std::string const &
     payload, lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
     if (ec) {return;}
     con->ping(payload,ec);
 }
-    
+
 template <typename connection, typename config>
-void endpoint<connection,config>::ping(connection_hdl hdl, std::string const & 
+void endpoint<connection,config>::ping(connection_hdl hdl, std::string const &
     payload)
 {
     lib::error_code ec;
@@ -199,16 +199,16 @@ void endpoint<connection,config>::ping(connection_hdl hdl, std::string const &
 }
 
 template <typename connection, typename config>
-void endpoint<connection,config>::pong(connection_hdl hdl, std::string const & 
+void endpoint<connection,config>::pong(connection_hdl hdl, std::string const &
     payload, lib::error_code & ec)
 {
     connection_ptr con = get_con_from_hdl(hdl,ec);
     if (ec) {return;}
     con->pong(payload,ec);
 }
-    
+
 template <typename connection, typename config>
-void endpoint<connection,config>::pong(connection_hdl hdl, std::string const & 
+void endpoint<connection,config>::pong(connection_hdl hdl, std::string const &
     payload)
 {
     lib::error_code ec;
@@ -221,12 +221,12 @@ void endpoint<connection,config>::remove_connection(connection_ptr con) {
     std::stringstream s;
     s << "remove_connection. New count: " << m_connections.size()-1;
     m_alog.write(log::alevel::devel,s.str());
-    
+
     scoped_lock_type lock(m_mutex);
-        
+
     // unregister the termination handler
     con->set_termination_handler(termination_handler());
-    
+
     m_connections.erase(con);
 }
 
diff --git a/websocketpp/impl/utilities_impl.hpp b/websocketpp/impl/utilities_impl.hpp
index 9614e092eb..368b8681f0 100644
--- a/websocketpp/impl/utilities_impl.hpp
+++ b/websocketpp/impl/utilities_impl.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_UTILITIES_IMPL_HPP
@@ -40,26 +40,26 @@ inline std::string to_lower(std::string const & in) {
 inline std::string to_hex(const std::string& input) {
     std::string output;
     std::string hex = "0123456789ABCDEF";
-    
+
     for (size_t i = 0; i < input.size(); i++) {
         output += hex[(input[i] & 0xF0) >> 4];
         output += hex[input[i] & 0x0F];
         output += " ";
     }
-    
+
     return output;
 }
 
 inline std::string to_hex(const uint8_t* input,size_t length) {
     std::string output;
     std::string hex = "0123456789ABCDEF";
-    
+
     for (size_t i = 0; i < length; i++) {
         output += hex[(input[i] & 0xF0) >> 4];
         output += hex[input[i] & 0x0F];
         output += " ";
     }
-    
+
     return output;
 }
 
@@ -67,7 +67,7 @@ inline std::string to_hex(const char* input,size_t length) {
     return to_hex(reinterpret_cast<const uint8_t*>(input),length);
 }
 
-inline std::string string_replace_all(std::string subject, const std::string& 
+inline std::string string_replace_all(std::string subject, const std::string&
     search, const std::string& replace)
 {
     size_t pos = 0;
diff --git a/websocketpp/logger/basic.hpp b/websocketpp/logger/basic.hpp
index 1be34aacce..975d45deb5 100644
--- a/websocketpp/logger/basic.hpp
+++ b/websocketpp/logger/basic.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,14 +22,14 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_LOGGER_BASIC_HPP
 #define WEBSOCKETPP_LOGGER_BASIC_HPP
 
 /* Need a way to print a message to the log
- * 
+ *
  * - timestamps
  * - channels
  * - thread safe
@@ -37,7 +37,7 @@
  * - selective output channels, both compile time and runtime
  * - named channels
  * - ability to test whether a log message will be printed at compile time
- * 
+ *
  */
 
 #include <ctime>
@@ -54,68 +54,68 @@ namespace log {
 template <typename concurrency, typename names>
 class basic {
 public:
-    basic<concurrency,names>(std::ostream* out = &std::cout) 
+    basic<concurrency,names>(std::ostream* out = &std::cout)
       : m_static_channels(0xffffffff)
       , m_dynamic_channels(0)
       , m_out(out) {}
-    
+
     basic<concurrency,names>(level c, std::ostream* out = &std::cout)
       : m_static_channels(c)
       , m_dynamic_channels(0)
       , m_out(out) {}
-    
+
     void set_ostream(std::ostream* out) {
         m_out = out;
     }
-    
+
     void set_channels(level channels) {
         if (channels == names::none) {
             clear_channels(names::all);
             return;
         }
-        
+
         scoped_lock_type lock(m_lock);
         m_dynamic_channels |= (channels & m_static_channels);
     }
-    
+
     void clear_channels(level channels) {
         scoped_lock_type lock(m_lock);
         m_dynamic_channels &= ~channels;
     }
-    
+
     void write(level channel, const std::string& msg) {
         scoped_lock_type lock(m_lock);
         if (!this->dynamic_test(channel)) { return; }
-        *m_out << "[" << timestamp << "] " 
-                  << "[" << names::channel_name(channel) << "] " 
+        *m_out << "[" << timestamp << "] "
+                  << "[" << names::channel_name(channel) << "] "
                   << msg << "\n";
         m_out->flush();
     }
-    
+
     void write(level channel, const char* msg) {
         scoped_lock_type lock(m_lock);
         if (!this->dynamic_test(channel)) { return; }
         *m_out << "[" << timestamp << "] "
-                  << "[" << names::channel_name(channel) << "] " 
+                  << "[" << names::channel_name(channel) << "] "
                   << msg << "\n";
         m_out->flush();
     }
-    
+
     bool static_test(level channel) const {
         return ((channel & m_static_channels) != 0);
     }
-    
+
     bool dynamic_test(level channel) {
         return ((channel & m_dynamic_channels) != 0);
     }
 private:
     typedef typename concurrency::scoped_lock_type scoped_lock_type;
     typedef typename concurrency::mutex_type mutex_type;
-    
+
     // The timestamp does not include the time zone, because on Windows with the
-    // default registry settings, the time zone would be written out in full, 
+    // default registry settings, the time zone would be written out in full,
     // which would be obnoxiously verbose.
-    // 
+    //
     // TODO: find a workaround for this or make this format user settable
     static std::ostream& timestamp(std::ostream& os) {
         std::time_t t = std::time(NULL);
@@ -130,7 +130,7 @@ private:
     }
 
     mutex_type m_lock;
-    
+
     const level m_static_channels;
     level m_dynamic_channels;
     std::ostream* m_out;
diff --git a/websocketpp/logger/levels.hpp b/websocketpp/logger/levels.hpp
index 5b7f851985..2c0e92c94d 100644
--- a/websocketpp/logger/levels.hpp
+++ b/websocketpp/logger/levels.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_LOGGER_LEVELS_HPP
@@ -42,29 +42,29 @@ struct elevel {
     static level const none = 0x0;
     /// Low level debugging information (warning: very chatty)
     static level const devel = 0x1;
-    /// Information about unusual system states or other minor internal library 
+    /// Information about unusual system states or other minor internal library
     /// problems, less chatty than devel.
     static level const library = 0x2;
     /// Information about minor configuration problems or additional information
     /// about other warnings.
     static level const info = 0x4;
-    /// Information about important problems not severe enough to terminate 
+    /// Information about important problems not severe enough to terminate
     /// connections.
     static level const warn = 0x8;
     /// Recoverable error. Recovery may mean cleanly closing the connection with
     /// an appropriate error code to the remote endpoint.
     static level const rerror = 0x10;
-    /// Unrecoverable error. This error will trigger immediate unclean 
+    /// Unrecoverable error. This error will trigger immediate unclean
     /// termination of the connection or endpoint.
     static level const fatal = 0x20;
     /// Special aggregate value representing "all levels"
     static level const all = 0xffffffff;
-    
+
     /// Get the textual name of a channel given a channel id
     /**
-     * The id must be that of a single channel. Passing an aggregate channel 
+     * The id must be that of a single channel. Passing an aggregate channel
      * package results in undefined behavior.
-     * 
+     *
      * @param channel The channel id to look up.
      *
      * @return The name of the specified channel.
@@ -93,10 +93,10 @@ struct elevel {
 struct alevel {
     /// Special aggregate value representing "no levels"
     static level const none = 0x0;
-    /// Information about new connections 
+    /// Information about new connections
     /**
-     * One line for each new connection that includes a host of information 
-     * including: the remote address, websocket version, requested resource, 
+     * One line for each new connection that includes a host of information
+     * including: the remote address, websocket version, requested resource,
      * http code, remote user agent
      */
     static level const connect = 0x1;
@@ -124,13 +124,13 @@ struct alevel {
     static level const app = 0x800;
     /// Special aggregate value representing "all levels"
     static level const all = 0xffffffff;
-    
+
     /// Get the textual name of a channel given a channel id
     /**
      * Get the textual name of a channel given a channel id. The id must be that
-     * of a single channel. Passing an aggregate channel package results in 
+     * of a single channel. Passing an aggregate channel package results in
      * undefined behavior.
-     * 
+     *
      * @param channel The channelid to look up.
      *
      * @return The name of the specified channel.
diff --git a/websocketpp/logger/stub.hpp b/websocketpp/logger/stub.hpp
index 4a73c67af6..f967612a8c 100644
--- a/websocketpp/logger/stub.hpp
+++ b/websocketpp/logger/stub.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_LOGGER_STUB_HPP
@@ -40,13 +40,13 @@ class stub {
 public:
     stub(std::ostream* out = &std::cout) {}
     stub(level c, std::ostream* out = &std::cout) {}
-    
+
     void set_channels(level channels) {}
     void clear_channels(level channels) {}
-    
+
     void write(level channel, const std::string& msg) {}
     void write(level channel, const char* msg) {}
-    
+
     bool static_test(level channel) const {return false;}
     bool dynamic_test(level channel) {return false;}
 };
diff --git a/websocketpp/message_buffer/alloc.hpp b/websocketpp/message_buffer/alloc.hpp
index 1b38baa4f3..5ac0ed433e 100644
--- a/websocketpp/message_buffer/alloc.hpp
+++ b/websocketpp/message_buffer/alloc.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
@@ -38,8 +38,8 @@ namespace alloc {
 /// A connection message manager that allocates a new message for each
 /// request.
 template <typename message>
-class con_msg_manager 
-  : public lib::enable_shared_from_this<con_msg_manager<message> > 
+class con_msg_manager
+  : public lib::enable_shared_from_this<con_msg_manager<message> >
 {
 public:
     typedef con_msg_manager<message> type;
@@ -47,8 +47,8 @@ public:
     typedef lib::weak_ptr<con_msg_manager> weak_ptr;
 
     typedef typename message::ptr message_ptr;
-    
-    /// Get an empty message buffer 
+
+    /// Get an empty message buffer
     /**
      * @return A shared pointer to an empty new message
      */
@@ -88,7 +88,7 @@ template <typename con_msg_manager>
 class endpoint_msg_manager {
 public:
     typedef typename con_msg_manager::ptr con_msg_man_ptr;
-    
+
     /// Get a pointer to a connection message manager
     /**
      * @return A pointer to the requested connection message manager.
diff --git a/websocketpp/message_buffer/message.hpp b/websocketpp/message_buffer/message.hpp
index dde75798e2..5fc25c508b 100644
--- a/websocketpp/message_buffer/message.hpp
+++ b/websocketpp/message_buffer/message.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
@@ -40,30 +40,30 @@ namespace message_buffer {
  * object that stores a message while it is being sent or received. Contains
  * the message payload itself, the message header, the extension data, and the
  * opcode.
- * 
+ *
  * # connection_message_manager:
  * An object that manages all of the message_buffers associated with a given
  * connection. Impliments the get_message_buffer(size) method that returns
  * a message buffer at least size bytes long.
- * 
- * Message buffers are reference counted with shared ownership semantics. Once 
+ *
+ * Message buffers are reference counted with shared ownership semantics. Once
  * requested from the manager the requester and it's associated downstream code
  * may keep a pointer to the message indefinitely at a cost of extra resource
  * usage. Once the reference count drops to the point where the manager is the
  * only reference the messages is recycled using whatever method is implemented
  * in the manager.
- * 
+ *
  * # endpoint_message_manager:
- * An object that manages connection_message_managers. Impliments the 
- * get_message_manager() method. This is used once by each connection to 
+ * An object that manages connection_message_managers. Impliments the
+ * get_message_manager() method. This is used once by each connection to
  * request the message manager that they are supposed to use to manage message
  * buffers for their own use.
- * 
+ *
  * TYPES OF CONNECTION_MESSAGE_MANAGERS
  * - allocate a message with the exact size every time one is requested
- * - maintain a pool of pre-allocated messages and return one when needed. 
+ * - maintain a pool of pre-allocated messages and return one when needed.
  *   Recycle previously used messages back into the pool
- * 
+ *
  * TYPES OF ENDPOINT_MESSAGE_MANAGERS
  *  - allocate a new connection manager for each connection. Message pools
  *    become connection specific. This increases memory usage but improves
@@ -84,11 +84,11 @@ template <template<class> class con_msg_manager>
 class message {
 public:
     typedef lib::shared_ptr<message> ptr;
-    
+
     typedef con_msg_manager<message> con_msg_man_type;
     typedef typename con_msg_man_type::ptr con_msg_man_ptr;
     typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
-    
+
     /// Construct an empty message
     /**
      * Construct an empty message
@@ -99,12 +99,12 @@ public:
       , m_fin(true)
       , m_terminal(false)
       , m_compressed(false) {}
-    
+
     /// Construct a message and fill in some values
     /**
-     * 
+     *
      */
-    message(const con_msg_man_ptr manager, frame::opcode::value op, size_t size = 128) 
+    message(const con_msg_man_ptr manager, frame::opcode::value op, size_t size = 128)
       : m_manager(manager)
       , m_opcode(op)
       , m_prepared(false)
@@ -114,7 +114,7 @@ public:
     {
         m_payload.reserve(size);
     }
-    
+
     /// Return whether or not the message has been prepared for sending
     /**
      * The prepared flag indicates that the message has been prepared by a
@@ -125,7 +125,7 @@ public:
     bool get_prepared() const {
         return m_prepared;
     }
-    
+
     /// Set or clear the flag that indicates that the message has been prepared
     /**
      * @param value The value to set the prepared flag to
@@ -133,7 +133,7 @@ public:
     void set_prepared(bool value) {
         m_prepared = value;
     }
-    
+
     /// Return whether or not the message is flagged as compressed
     /**
      * The compression flag is used to indicate whether or not the message is
@@ -144,7 +144,7 @@ public:
     bool get_compressed() const {
         return m_compressed;
     }
-    
+
     /// Set or clear the compression flag
     /**
      * @param value The value to set the compressed flag to
@@ -174,7 +174,7 @@ public:
     /// Read the fin bit
     /**
      * A message with the fin bit set will be sent as the last message of its
-     * sequence. A message with the fin bit cleared will require subsequent 
+     * sequence. A message with the fin bit cleared will require subsequent
      * frames of opcode continuation until one of them has the fin bit set.
      *
      * The remote end likely will not deliver any bytes until the frame with the fin
@@ -185,7 +185,7 @@ public:
     bool get_fin() const {
         return m_fin;
     }
-    
+
     /// Set the fin bit
     /**
      * @see get_fin for a more detailed explaination of the fin bit
@@ -200,12 +200,12 @@ public:
     frame::opcode::value get_opcode() const {
         return m_opcode;
     }
-    
+
     /// Set the opcode
     void set_opcode(frame::opcode::value op) {
         m_opcode = op;
     }
-    
+
     /// Return the prepared frame header
     /**
      * This value is typically set by a websocket protocol processor
@@ -224,11 +224,11 @@ public:
     void set_header(const std::string& header) {
         m_header = header;
     }
-    
+
     const std::string& get_extension_data() const {
         return m_extension_data;
     }
-    
+
     /// Get a reference to the payload string
     /**
      * @return A const reference to the message's payload string
@@ -236,7 +236,7 @@ public:
     const std::string& get_payload() const {
         return m_payload;
     }
-    
+
     /// Get a non-const reference to the payload string
     /**
      * @return A reference to the message's payload string
@@ -248,17 +248,17 @@ public:
     void set_payload(const std::string& payload) {
         m_payload = payload;
     }
-    
+
     void set_payload(const void *payload, size_t len) {
         m_payload.reserve(len);
         const char* pl = static_cast<const char *>(payload);
         m_payload.assign(pl, pl + len);
     }
-    
+
     void append_payload(const std::string& payload) {
         m_payload.append(payload);
     }
-    
+
     void append_payload(const void *payload, size_t len) {
         m_payload.reserve(m_payload.size()+len);
         m_payload.append(static_cast<const char *>(payload),len);
@@ -271,10 +271,10 @@ public:
      * from the manager's recycle member function should be passed back up the
      * call chain. The caller to message::recycle will deal with them.
      *
-     * Recycle must *only* be called by the message shared_ptr's destructor. 
-     * Once recycled successfully, ownership of the memory has been passed to 
+     * Recycle must *only* be called by the message shared_ptr's destructor.
+     * Once recycled successfully, ownership of the memory has been passed to
      * another system and must not be accessed again.
-     * 
+     *
      * @return true if the message was successfully recycled, false otherwise.
      */
     bool recycle() {
diff --git a/websocketpp/message_buffer/pool.hpp b/websocketpp/message_buffer/pool.hpp
index d14259fd7d..46e240132d 100644
--- a/websocketpp/message_buffer/pool.hpp
+++ b/websocketpp/message_buffer/pool.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
@@ -39,30 +39,30 @@ namespace message_buffer {
  * object that stores a message while it is being sent or received. Contains
  * the message payload itself, the message header, the extension data, and the
  * opcode.
- * 
+ *
  * # connection_message_manager:
  * An object that manages all of the message_buffers associated with a given
  * connection. Impliments the get_message_buffer(size) method that returns
  * a message buffer at least size bytes long.
- * 
- * Message buffers are reference counted with shared ownership semantics. Once 
+ *
+ * Message buffers are reference counted with shared ownership semantics. Once
  * requested from the manager the requester and it's associated downstream code
  * may keep a pointer to the message indefinitely at a cost of extra resource
  * usage. Once the reference count drops to the point where the manager is the
  * only reference the messages is recycled using whatever method is implemented
  * in the manager.
- * 
+ *
  * # endpoint_message_manager:
- * An object that manages connection_message_managers. Impliments the 
- * get_message_manager() method. This is used once by each connection to 
+ * An object that manages connection_message_managers. Impliments the
+ * get_message_manager() method. This is used once by each connection to
  * request the message manager that they are supposed to use to manage message
  * buffers for their own use.
- * 
+ *
  * TYPES OF CONNECTION_MESSAGE_MANAGERS
  * - allocate a message with the exact size every time one is requested
- * - maintain a pool of pre-allocated messages and return one when needed. 
+ * - maintain a pool of pre-allocated messages and return one when needed.
  *   Recycle previously used messages back into the pool
- * 
+ *
  * TYPES OF ENDPOINT_MESSAGE_MANAGERS
  *  - allocate a new connection manager for each connection. Message pools
  *    become connection specific. This increases memory usage but improves
@@ -74,7 +74,7 @@ namespace message_buffer {
  */
 
 /// Custom deleter for use in shared_ptrs to message.
-/** 
+/**
  * This is used to catch messages about to be deleted and offer the manager the
  * ability to recycle them instead. Message::recycle will return true if it was
  * successfully recycled and false otherwise. In the case of exceptions or error
@@ -101,10 +101,10 @@ template <typename con_msg_manager>
 class message {
 public:
     typedef lib::shared_ptr<message> ptr;
-    
+
     typedef typename con_msg_manager::weak_ptr con_msg_man_ptr;
 
-    message(con_msg_man_ptr manager, size_t size = 128) 
+    message(con_msg_man_ptr manager, size_t size = 128)
       : m_manager(manager)
       , m_payload(size) {}
 
@@ -120,7 +120,7 @@ public:
     const std::string& get_payload() const {
         return m_payload;
     }
-    
+
     /// Recycle the message
     /**
      * A request to recycle this message was received. Forward that request to
@@ -128,10 +128,10 @@ public:
      * from the manager's recycle member function should be passed back up the
      * call chain. The caller to message::recycle will deal with them.
      *
-     * Recycle must *only* be called by the message shared_ptr's destructor. 
-     * Once recycled successfully, ownership of the memory has been passed to 
+     * Recycle must *only* be called by the message shared_ptr's destructor.
+     * Once recycled successfully, ownership of the memory has been passed to
      * another system and must not be accessed again.
-     * 
+     *
      * @return true if the message was successfully recycled, false otherwise.
      */
     bool recycle() {
@@ -145,7 +145,7 @@ public:
     }
 private:
     con_msg_man_ptr             m_manager;
-    
+
     frame::opcode::value        m_opcode;
     std::string                 m_header;
     std::string                 m_extension_data;
@@ -163,7 +163,7 @@ public:
     typedef lib::weak_ptr<con_msg_manager> weak_ptr;
 
     typedef typename message::ptr message_ptr;
-    
+
     /// Get a message buffer with specified size
     /**
      * @param size Minimum size in bytes to request for the message payload.
@@ -173,7 +173,7 @@ public:
     message_ptr get_message(size_t size) const {
         return message_ptr(new message(size));
     }
-    
+
     /// Recycle a message
     /**
      * This method shouldn't be called. If it is, return false to indicate an
@@ -195,7 +195,7 @@ template <typename con_msg_manager>
 class endpoint_msg_manager {
 public:
     typedef typename con_msg_manager::ptr con_msg_man_ptr;
-    
+
     /// Get a pointer to a connection message manager
     /**
      * @return A pointer to the requested connection message manager.
@@ -214,7 +214,7 @@ namespace pool {
 class con_msg_manager {
 
 };
-    
+
 /// An endpoint manager that maintains a shared pool of connection managers
 /// and returns an appropriate one for the requesting connection.
 class endpoint_msg_manager {
diff --git a/websocketpp/processors/base.hpp b/websocketpp/processors/base.hpp
index 79cbf84223..e455e842ad 100644
--- a/websocketpp/processors/base.hpp
+++ b/websocketpp/processors/base.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_PROCESSOR_BASE_HPP
@@ -68,19 +68,19 @@ enum processor_errors {
     /// Catch-all error for processor policy errors that don't fit in other
     /// categories
     general = 1,
-    
+
     /// Error was the result of improperly formatted user input
     bad_request,
-    
+
     /// Processor encountered a protocol violation in an incoming message
     protocol_violation,
-    
+
     /// Processor encountered a message that was too large
     message_too_big,
-    
+
     /// Processor encountered invalid payload data.
     invalid_payload,
-    
+
     /// The processor method was called with invalid arguments
     invalid_arguments,
 
@@ -92,7 +92,7 @@ enum processor_errors {
 
     /// Illegal use of reserved bit
     invalid_rsv_bit,
-    
+
     /// Fragmented control message
     fragmented_control,
 
@@ -122,7 +122,7 @@ enum processor_errors {
 
     /// Invalid HTTP version
     invalid_http_version,
-    
+
     /// Invalid HTTP status
     invalid_http_status,
 
@@ -162,7 +162,7 @@ public:
     char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
         return "websocketpp.processor";
     }
-    
+
     std::string message(int value) const {
         switch(value) {
             case error::general:
@@ -242,22 +242,22 @@ inline lib::error_code make_error_code(error::processor_errors e) {
 
 /// Converts a processor error_code into a websocket close code
 /**
- * Looks up the appropriate WebSocket close code that should be sent after an 
+ * Looks up the appropriate WebSocket close code that should be sent after an
  * error of this sort occurred.
- * 
- * If the error is not in the processor category close::status::blank is 
+ *
+ * If the error is not in the processor category close::status::blank is
  * returned.
  *
  * If the error isn't normally associated with reasons to close a connection
- * (such as errors intended to be used internally or delivered to client 
- * applications, ex: invalid arguments) then 
+ * (such as errors intended to be used internally or delivered to client
+ * applications, ex: invalid arguments) then
  * close::status::internal_endpoint_error is returned.
  */
 inline close::status::value to_ws(lib::error_code ec) {
     if (ec.category() != get_processor_category()) {
         return close::status::blank;
     }
-    
+
     switch (ec.value()) {
         case error::protocol_violation:
         case error::control_too_big:
diff --git a/websocketpp/processors/hybi00.hpp b/websocketpp/processors/hybi00.hpp
index 9963f26f30..27d0f93693 100644
--- a/websocketpp/processors/hybi00.hpp
+++ b/websocketpp/processors/hybi00.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_PROCESSOR_HYBI00_HPP
@@ -48,35 +48,35 @@ template <typename config>
 class hybi00 : public processor<config> {
 public:
     typedef processor<config> base;
-    
+
     typedef typename config::request_type request_type;
     typedef typename config::response_type response_type;
-    
+
     typedef typename config::message_type message_type;
     typedef typename message_type::ptr message_ptr;
 
     typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
 
-    explicit hybi00(bool secure, bool server, msg_manager_ptr manager) 
+    explicit hybi00(bool secure, bool server, msg_manager_ptr manager)
       : processor<config>(secure, server)
       , msg_hdr(0x00)
       , msg_ftr(0xff)
       , m_state(HEADER)
       , m_msg_manager(manager) {}
-    
+
     int get_version() const {
         return 0;
     }
-    
+
     lib::error_code validate_handshake(request_type const & r) const {
         if (r.get_method() != "GET") {
             return make_error_code(error::invalid_http_method);
         }
-        
+
         if (r.get_version() != "HTTP/1.1") {
             return make_error_code(error::invalid_http_version);
         }
-        
+
         // required headers
         // Host is required by HTTP/1.1
         // Connection is required by is_websocket_handshake
@@ -90,18 +90,18 @@ public:
 
         return lib::error_code();
     }
-    
+
     lib::error_code process_handshake(request_type const & req,
         std::string const & subprotocol, response_type & res) const
     {
         char key_final[16];
-        
+
         // copy key1 into final key
         decode_client_key(req.get_header("Sec-WebSocket-Key1"), &key_final[0]);
-                
+
         // copy key2 into final key
         decode_client_key(req.get_header("Sec-WebSocket-Key2"), &key_final[4]);
-        
+
         // copy key3 into final key
         // key3 should be exactly 8 bytes. If it is more it will be truncated
         // if it is less the final key will almost certainly be wrong.
@@ -111,77 +111,77 @@ public:
         std::copy(key3.c_str(),
                   key3.c_str()+std::min(static_cast<size_t>(8), key3.size()),
                   &key_final[8]);
-        
+
         res.append_header(
             "Sec-WebSocket-Key3",
             md5::md5_hash_string(std::string(key_final,16))
         );
-        
+
         res.append_header("Upgrade","WebSocket");
         res.append_header("Connection","Upgrade");
-        
+
         // Echo back client's origin unless our local application set a
         // more restrictive one.
         if (res.get_header("Sec-WebSocket-Origin") == "") {
             res.append_header("Sec-WebSocket-Origin",req.get_header("Origin"));
         }
-        
+
         // Echo back the client's request host unless our local application
         // set a different one.
         if (res.get_header("Sec-WebSocket-Location") == "") {
             uri_ptr uri = get_uri(req);
             res.append_header("Sec-WebSocket-Location",uri->str());
         }
-        
+
         if (subprotocol != "") {
             res.replace_header("Sec-WebSocket-Protocol",subprotocol);
         }
-        
+
         return lib::error_code();
     }
-    
+
     // outgoing client connection processing is not supported for this version
     lib::error_code client_handshake_request(request_type& req, uri_ptr uri,
         std::vector<std::string> const & subprotocols) const
     {
         return error::make_error_code(error::no_protocol_support);
     }
-    
+
     lib::error_code validate_server_handshake_response(request_type const & req,
         response_type & res) const
     {
         return error::make_error_code(error::no_protocol_support);
     }
-    
+
     std::string get_raw(response_type const & res) const {
         response_type temp = res;
         temp.remove_header("Sec-WebSocket-Key3");
         return temp.raw() + res.get_header("Sec-WebSocket-Key3");
     }
-    
+
     std::string const & get_origin(request_type const & r) const {
         return r.get_header("Origin");
     }
-    
+
     // hybi00 doesn't support subprotocols so there never will be any requested
     lib::error_code extract_subprotocols(request_type const & req,
         std::vector<std::string> & subprotocol_list)
     {
         return lib::error_code();
     }
-    
+
     uri_ptr get_uri(request_type const & request) const {
         std::string h = request.get_header("Host");
-        
+
         size_t last_colon = h.rfind(":");
         size_t last_sbrace = h.rfind("]");
-        
+
         // no : = hostname with no port
         // last : before ] = ipv6 literal with no port
         // : with no ] = hostname with port
         // : after ] = ipv6 literal with port
-                
-        if (last_colon == std::string::npos || 
+
+        if (last_colon == std::string::npos ||
             (last_sbrace != std::string::npos && last_sbrace > last_colon))
         {
             return uri_ptr(new uri(base::m_secure, h, request.get_uri()));
@@ -191,13 +191,13 @@ public:
                                    h.substr(last_colon+1),
                                    request.get_uri()));
         }
-        
+
         // TODO: check if get_uri is a full uri
     }
-    
+
     /// Get hybi00 handshake key3
     /**
-     * @todo This doesn't appear to be used anymore. It might be able to be 
+     * @todo This doesn't appear to be used anymore. It might be able to be
      * removed
      */
     std::string get_key3() const {
@@ -218,7 +218,7 @@ public:
                 if (buf[p] == msg_hdr) {
                     p++;
                     m_msg_ptr = m_msg_manager->get_message(frame::opcode::text,1);
-                    
+
                     if (!m_msg_ptr) {
                         ec = make_error_code(websocketpp::error::no_incoming_buffers);
                         m_state = FATAL_ERROR;
@@ -231,7 +231,7 @@ public:
                 }
             } else if (m_state == PAYLOAD) {
                 uint8_t *it = std::find(buf+p,buf+len,msg_ftr);
-                
+
                 // 0    1    2    3    4    5
                 // 0x00 0x23 0x23 0x23 0xff 0xXX
 
@@ -239,7 +239,7 @@ public:
                 l = static_cast<size_t>(it-(buf+p));
                 m_msg_ptr->append_payload(buf+p,l);
                 p += l;
-                
+
                 if (it != buf+len) {
                     // message is done, copy it and the trailing
                     p++;
@@ -252,12 +252,12 @@ public:
             }
         }
         // If we get one, we create a new message and move to application state
-        
+
         // if in state application we are copying bytes into the output message
         // and validating them for UTF8 until we hit a 0xff byte. Once we hit
         // 0x00, the message is complete and is dispatched. Then we go back to
         // header state.
-        
+
         //ec = make_error_code(error::not_implemented);
         return p;
     }
@@ -265,7 +265,7 @@ public:
     bool ready() const {
         return (m_state == READY);
     }
-    
+
     bool get_error() const {
         return false;
     }
@@ -276,10 +276,10 @@ public:
         m_state = HEADER;
         return ret;
     }
-    
+
     /// Prepare a message for writing
     /**
-     * Performs validation, masking, compression, etc. will return an error if 
+     * Performs validation, masking, compression, etc. will return an error if
      * there was an error, otherwise msg will be ready to be written
      */
     virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out)
@@ -287,14 +287,14 @@ public:
         if (!in || !out) {
             return make_error_code(error::invalid_arguments);
         }
-        
+
         // TODO: check if the message is prepared already
-        
+
         // validate opcode
         if (in->get_opcode() != frame::opcode::text) {
-            return make_error_code(error::invalid_opcode);    
+            return make_error_code(error::invalid_opcode);
         }
-        
+
         std::string& i = in->get_raw_payload();
         //std::string& o = out->get_raw_payload();
 
@@ -305,14 +305,14 @@ public:
 
         // generate header
         out->set_header(std::string(reinterpret_cast<char const *>(&msg_hdr),1));
-        
+
         // process payload
         out->set_payload(i);
         out->append_payload(std::string(reinterpret_cast<char const *>(&msg_ftr),1));
 
         // hybi00 doesn't support compression
         // hybi00 doesn't have masking
-        
+
         out->set_prepared(true);
 
         return lib::error_code();
@@ -327,14 +327,14 @@ public:
     {
         return lib::error_code(error::no_protocol_support);
     }
-    
+
     lib::error_code prepare_close(close::status::value code,
         std::string const & reason, message_ptr out) const
     {
         if (!out) {
             return lib::error_code(error::invalid_arguments);
         }
-        
+
         std::string val;
         val.append(1,'\xff');
         val.append(1,'\x00');
@@ -348,7 +348,7 @@ private:
         unsigned int spaces = 0;
         std::string digits = "";
         uint32_t num;
-        
+
         // key2
         for (size_t i = 0; i < key.size(); i++) {
             if (key[i] == ' ') {
@@ -357,7 +357,7 @@ private:
                 digits += key[i];
             }
         }
-        
+
         num = static_cast<uint32_t>(strtoul(digits.c_str(), NULL, 10));
         if (spaces > 0 && num > 0) {
             num = htonl(num/spaces);
@@ -368,19 +368,19 @@ private:
             std::fill(result,result+4,0);
         }
     }
-    
+
     enum state {
         HEADER = 0,
         PAYLOAD = 1,
         READY = 2,
         FATAL_ERROR = 3
     };
-    
+
     uint8_t const msg_hdr;
     uint8_t const msg_ftr;
 
     state m_state;
-    
+
     msg_manager_ptr m_msg_manager;
     message_ptr m_msg_ptr;
     utf8_validator::validator m_validator;
diff --git a/websocketpp/processors/hybi07.hpp b/websocketpp/processors/hybi07.hpp
index e1502cc318..8b2df0ee8e 100644
--- a/websocketpp/processors/hybi07.hpp
+++ b/websocketpp/processors/hybi07.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_PROCESSOR_HYBI07_HPP
diff --git a/websocketpp/processors/hybi08.hpp b/websocketpp/processors/hybi08.hpp
index 5463221918..54f21036b7 100644
--- a/websocketpp/processors/hybi08.hpp
+++ b/websocketpp/processors/hybi08.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_PROCESSOR_HYBI08_HPP
@@ -42,25 +42,25 @@ class hybi08 : public hybi13<config> {
 public:
     typedef hybi08<config> type;
     typedef typename config::request_type request_type;
-    
+
     typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
     typedef typename config::rng_type rng_type;
 
-    explicit hybi08(bool secure, bool server, msg_manager_ptr manager, 
-        rng_type& rng) 
+    explicit hybi08(bool secure, bool server, msg_manager_ptr manager,
+        rng_type& rng)
       : hybi13<config>(secure, server, manager, rng) {}
-    
+
     // outgoing client connection processing is not supported for this version
     lib::error_code client_handshake_request(request_type& req, uri_ptr uri,
         std::vector<std::string> const & subprotocols) const
     {
         return error::make_error_code(error::no_protocol_support);
     }
-    
+
     int get_version() const {
         return 8;
     }
-    
+
     const std::string& get_origin(request_type const & r) const {
         return r.get_header("Sec-WebSocket-Origin");
     }
diff --git a/websocketpp/processors/processor.hpp b/websocketpp/processors/processor.hpp
index b8472ec148..6333b5b543 100644
--- a/websocketpp/processors/processor.hpp
+++ b/websocketpp/processors/processor.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_PROCESSOR_HPP
@@ -45,37 +45,37 @@ namespace websocketpp {
  * various WebSocket related data structures and perform processing that is not
  * related to specific versions of the protocol.
  *
- * It also includes the abstract interface for the protocol specific processing 
- * engines. These engines wrap all of the logic necessary for parsing and 
+ * It also includes the abstract interface for the protocol specific processing
+ * engines. These engines wrap all of the logic necessary for parsing and
  * validating WebSocket handshakes and messages of specific protocol version
  * and set of allowed extensions.
  *
- * An instance of a processor represents the state of a single WebSocket 
- * connection of the associated version. One processor instance is needed per 
- * logical WebSocket connection. 
+ * An instance of a processor represents the state of a single WebSocket
+ * connection of the associated version. One processor instance is needed per
+ * logical WebSocket connection.
  */
 namespace processor {
 
 /// Determine whether or not a generic HTTP request is a WebSocket handshake
 /**
  * @param r The HTTP request to read.
- * 
+ *
  * @return True if the request is a WebSocket handshake, false otherwise
- */ 
+ */
 template <typename request_type>
 bool is_websocket_handshake(request_type& r) {
     using utility::ci_find_substr;
-    
+
     std::string const & upgrade_header = r.get_header("Upgrade");
-    
+
     if (ci_find_substr(upgrade_header, constants::upgrade_token,
         sizeof(constants::upgrade_token)-1) == upgrade_header.end())
     {
         return false;
     }
-    
+
     std::string const & con_header = r.get_header("Connection");
-    
+
     if (ci_find_substr(con_header, constants::connection_token,
         sizeof(constants::connection_token)-1) == con_header.end())
     {
@@ -88,17 +88,17 @@ bool is_websocket_handshake(request_type& r) {
 /// Extract the version from a WebSocket handshake request
 /**
  * A blank version header indicates a spec before versions were introduced.
- * The only such versions in shipping products are Hixie Draft 75 and Hixie 
+ * The only such versions in shipping products are Hixie Draft 75 and Hixie
  * Draft 76. Draft 75 is present in Chrome 4-5 and Safari 5.0.0, Draft 76 (also
- * known as hybi 00 is present in Chrome 6-13 and Safari 5.0.1+. As 
- * differentiating between these two sets of browsers is very difficult and 
- * Safari 5.0.1+ accounts for the vast majority of cases in the wild this 
- * function assumes that all handshakes without a valid version header are 
+ * known as hybi 00 is present in Chrome 6-13 and Safari 5.0.1+. As
+ * differentiating between these two sets of browsers is very difficult and
+ * Safari 5.0.1+ accounts for the vast majority of cases in the wild this
+ * function assumes that all handshakes without a valid version header are
  * Hybi 00.
  *
- * @param r The WebSocket handshake request to read.  
+ * @param r The WebSocket handshake request to read.
  *
- * @return The WebSocket handshake version or -1 if there was an extraction 
+ * @return The WebSocket handshake version or -1 if there was an extraction
  * error.
  */
 template <typename request_type>
@@ -106,14 +106,14 @@ int get_websocket_version(request_type& r) {
     if (r.get_header("Sec-WebSocket-Version") == "") {
         return 0;
     }
-    
+
     int version;
     std::istringstream ss(r.get_header("Sec-WebSocket-Version"));
-                
+
     if ((ss >> version).fail()) {
         return -1;
     }
-    
+
     return version;
 }
 
@@ -121,7 +121,7 @@ int get_websocket_version(request_type& r) {
 /**
  * @param request The request to extract the Host header from.
  *
- * @param scheme The scheme under which this request was received (ws, wss, 
+ * @param scheme The scheme under which this request was received (ws, wss,
  * http, https, etc)
  *
  * @return A uri_pointer that encodes the value of the host header.
@@ -129,15 +129,15 @@ int get_websocket_version(request_type& r) {
 template <typename request_type>
 uri_ptr get_uri_from_host(request_type & request, std::string scheme) {
     std::string h = request.get_header("Host");
-        
+
     size_t last_colon = h.rfind(":");
     size_t last_sbrace = h.rfind("]");
-            
+
     // no : = hostname with no port
     // last : before ] = ipv6 literal with no port
     // : with no ] = hostname with port
     // : after ] = ipv6 literal with port
-    if (last_colon == std::string::npos || 
+    if (last_colon == std::string::npos ||
         (last_sbrace != std::string::npos && last_sbrace > last_colon))
     {
         return uri_ptr(new uri(scheme, h, request.get_uri()));
@@ -162,9 +162,9 @@ public:
     explicit processor(bool secure, bool server)
       : m_secure(secure)
       , m_server(server) {}
-      
+
     virtual ~processor() {}
-    
+
     /// Get the protocol version of this processor
     virtual int get_version() const = 0;
 
@@ -189,11 +189,11 @@ public:
 
     /// validate a WebSocket handshake request for this version
     /**
-     * @param request The WebSocket handshake request to validate. 
-     * is_websocket_handshake(request) must be true and 
+     * @param request The WebSocket handshake request to validate.
+     * is_websocket_handshake(request) must be true and
      * get_websocket_version(request) must equal this->get_version().
      *
-     * @return A status code, 0 on success, non-zero for specific sorts of 
+     * @return A status code, 0 on success, non-zero for specific sorts of
      * failure
      */
     virtual lib::error_code validate_handshake(request_type const & request)
@@ -211,16 +211,16 @@ public:
      */
     virtual lib::error_code process_handshake(request_type const & req,
         std::string const & subprotocol, response_type& res) const = 0;
-    
+
     /// Fill in an HTTP request for an outgoing connection handshake
     /**
      * @param req The request to process.
      *
      * @return An error code, 0 on success, non-zero for other errors
      */
-    virtual lib::error_code client_handshake_request(request_type & req, 
+    virtual lib::error_code client_handshake_request(request_type & req,
         uri_ptr uri, std::vector<std::string> const & subprotocols) const = 0;
-        
+
     /// Validate the server's response to an outgoing handshake request
     /**
      * @param req The original request sent
@@ -229,21 +229,21 @@ public:
      *
      * @return An error code, 0 on success, non-zero for other errors
      */
-    virtual lib::error_code validate_server_handshake_response(request_type 
+    virtual lib::error_code validate_server_handshake_response(request_type
         const & req, response_type & res) const = 0;
-    
+
     /// Given a completed response, get the raw bytes to put on the wire
     virtual std::string get_raw(response_type const & request) const = 0;
-    
+
     /// Return the value of the header containing the CORS origin.
-    virtual std::string const & get_origin(request_type const & request) 
+    virtual std::string const & get_origin(request_type const & request)
         const = 0;
-    
+
     /// Extracts requested subprotocols from a handshake request
     /**
      * Extracts a list of all subprotocols that the client has requested in the
      * given opening handshake request.
-     * 
+     *
      * @param req The request to extract from
      *
      * @param subprotocol_list A reference to a vector of strings to store the
@@ -251,13 +251,13 @@ public:
      */
     virtual lib::error_code extract_subprotocols(const request_type & req,
         std::vector<std::string> & subprotocol_list) = 0;
-    
+
     /// Extracts client uri from a handshake request
     virtual uri_ptr get_uri(request_type const & request) const = 0;
-    
+
     /// process new websocket connection bytes
     /**
-     * WebSocket connections are a continous stream of bytes that must be 
+     * WebSocket connections are a continous stream of bytes that must be
      * interpreted by a protocol processor into discrete frames.
      *
      * @param buf Buffer from which bytes should be read.
@@ -269,10 +269,10 @@ public:
      * @return Number of bytes processed
      */
     virtual size_t consume(uint8_t *buf, size_t len, lib::error_code & ec) = 0;
-    
+
     /// Checks if there is a message ready
     /**
-     * Checks if the most recent consume operation processed enough bytes to 
+     * Checks if the most recent consume operation processed enough bytes to
      * complete a new WebSocket message. The message can be retrieved by calling
      * get_message() which will reset the internal state to not-ready and allow
      * consume to read more bytes.
@@ -284,7 +284,7 @@ public:
     /// Retrieves the most recently processed message
     /**
      * Retrieves a shared pointer to the recently completed message if there is
-     * one. If ready() returns true then there is a message available. 
+     * one. If ready() returns true then there is a message available.
      * Retrieving the message with get_message will reset the state of ready.
      * As such, each new message may be retrieved only once. Calling get_message
      * when there is no message available will result in a null pointer being
@@ -294,23 +294,23 @@ public:
      *         pointer.
      */
     virtual message_ptr get_message() = 0;
-    
+
     /// Tests whether the processor is in a fatal error state
     virtual bool get_error() const = 0;
 
     /// Retrieves the number of bytes presently needed by the processor
-    /// This value may be used as a hint to the transport layer as to how many 
+    /// This value may be used as a hint to the transport layer as to how many
     /// bytes to wait for before running consume again.
     virtual size_t get_bytes_needed() const {
         return 1;
     }
-    
+
     /// Prepare a data message for writing
     /**
-     * Performs validation, masking, compression, etc. will return an error if 
+     * Performs validation, masking, compression, etc. will return an error if
      * there was an error, otherwise msg will be ready to be written
      */
-    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out) 
+    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out)
         = 0;
 
     /// Prepare a ping frame
@@ -324,7 +324,7 @@ public:
      *
      * @return Status code, zero on success, non-zero on failure
      */
-    virtual lib::error_code prepare_ping(std::string const & in, 
+    virtual lib::error_code prepare_ping(std::string const & in,
         message_ptr out) const = 0;
 
     /// Prepare a pong frame
@@ -356,7 +356,7 @@ public:
      *
      * @return Status code, zero on success, non-zero on failure
      */
-    virtual lib::error_code prepare_close(close::status::value code, 
+    virtual lib::error_code prepare_close(close::status::value code,
         std::string const & reason, message_ptr out) const = 0;
 protected:
     bool const m_secure;
diff --git a/websocketpp/random/none.hpp b/websocketpp/random/none.hpp
index bd740021df..60fe77288e 100644
--- a/websocketpp/random/none.hpp
+++ b/websocketpp/random/none.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_RANDOM_NONE_HPP
@@ -45,7 +45,7 @@ template <typename int_type>
 class int_generator {
     public:
         int_generator() {}
-        
+
         /// advances the engine's state and returns the generated value
         int_type operator()() {
             return 0;
@@ -56,4 +56,4 @@ class int_generator {
 } // namespace random
 } // namespace websocketpp
 
-#endif //WEBSOCKETPP_RANDOM_NONE_HPP
\ No newline at end of file
+#endif //WEBSOCKETPP_RANDOM_NONE_HPP
diff --git a/websocketpp/random/random_device.hpp b/websocketpp/random/random_device.hpp
index fec2bb65a5..7645399b98 100644
--- a/websocketpp/random/random_device.hpp
+++ b/websocketpp/random/random_device.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
@@ -44,7 +44,7 @@ namespace random_device {
  * Thread-safety is provided via locking based on the concurrency template
  * parameter.
  *
- * Non-deterministic RNG is provided via websocketpp::lib which uses either 
+ * Non-deterministic RNG is provided via websocketpp::lib which uses either
  * C++11 or Boost 1.47+'s random_device class.
  *
  * Call operator() to generate the next number
@@ -54,22 +54,22 @@ class int_generator {
     public:
         typedef typename concurrency::scoped_lock_type scoped_lock_type;
         typedef typename concurrency::mutex_type mutex_type;
-        
+
         /// constructor
         //mac TODO: figure out if signed types present a range problem
         int_generator() {}
-        
+
         /// advances the engine's state and returns the generated value
         int_type operator()() {
             scoped_lock_type guard(m_lock);
             return m_dis(m_rng);
         }
     private:
-        
-        
+
+
         lib::random_device m_rng;
         lib::uniform_int_distribution<int_type> m_dis;
-        
+
         mutex_type m_lock;
 };
 
@@ -77,4 +77,4 @@ class int_generator {
 } // namespace random
 } // namespace websocketpp
 
-#endif //WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
\ No newline at end of file
+#endif //WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
diff --git a/websocketpp/roles/client_endpoint.hpp b/websocketpp/roles/client_endpoint.hpp
index e04be8f134..7ce05eceed 100644
--- a/websocketpp/roles/client_endpoint.hpp
+++ b/websocketpp/roles/client_endpoint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_CLIENT_ENDPOINT_HPP
@@ -44,13 +44,13 @@ template <typename config>
 class client : public endpoint<connection<config>,config> {
 public:
     /// Type of this endpoint
-    typedef client<config> type;    
-    
+    typedef client<config> type;
+
     /// Type of the endpoint concurrency component
     typedef typename config::concurrency_type concurrency_type;
     /// Type of the endpoint transport component
     typedef typename config::transport_type transport_type;
-    
+
     /// Type of the connections this server will create
     typedef connection<config> connection_type;
     /// Type of a shared pointer to the connections this server will create
@@ -63,20 +63,20 @@ public:
 
     /// Type of the endpoint component of this server
     typedef endpoint<connection_type,config> endpoint_type;
-    
+
     explicit client() : endpoint_type(false)
     {
         endpoint_type::m_alog.write(log::alevel::devel,
             "client constructor");
     }
-    
+
     /// Get a new connection
     /**
      * Creates and returns a pointer to a new connection to the given URI
      * suitable for passing to connect(connection_ptr). This method allows
      * applying connection specific settings before performing the opening
      * handshake.
-     * 
+     *
      * @return A connection_ptr to the new connection
      */
     connection_ptr get_connection(uri_ptr location, lib::error_code &ec) {
@@ -84,17 +84,17 @@ public:
             ec = error::make_error_code(error::endpoint_not_secure);
             return connection_ptr();
         }
-        
+
         // create connection
         connection_ptr con = endpoint_type::create_connection();
-        
+
         if (!con) {
             ec = error::make_error_code(error::con_creation_failed);
             return con;
         }
-        
+
         con->set_uri(location);
-        
+
         // Success
         ec = lib::error_code();
         return con;
@@ -105,13 +105,13 @@ public:
      * Creates and returns a pointer to a new connection to the given URI
      * suitable for passing to connect(connection_ptr). This overload allows
      * default construction of the uri_ptr from a standard string.
-     * 
+     *
      * @return A connection_ptr to the new connection
      */
     connection_ptr get_connection(const std::string& u, lib::error_code &ec) {
         // parse uri
         uri_ptr location(new uri(u));
-        
+
         if (!location->get_valid()) {
             ec = error::make_error_code(error::invalid_uri);
             return connection_ptr();
@@ -119,7 +119,7 @@ public:
 
         return get_connection(location, ec);
     }
-    
+
     /// Begin the connection process for the given connection
     /**
      * Initiates the opening connection handshake for connection con. Exact
@@ -141,19 +141,19 @@ public:
                 lib::placeholders::_2
             )
         );
-        
+
         return con;
     }
-    
-    
-    
+
+
+
     // connect(...)
 private:
     // handle_connect
     void handle_connect(connection_hdl hdl, const lib::error_code & ec) {
         lib::error_code hdl_ec;
         connection_ptr con = endpoint_type::get_con_from_hdl(hdl,hdl_ec);
-        
+
         if (hdl_ec == error::bad_connection) {
             endpoint_type::m_elog.write(log::elevel::fatal,
                 "handle_connect got an invalid handle back");
@@ -167,13 +167,13 @@ private:
             // TODO
             // Set connection's failure reasons
             con->terminate(ec);
-            
+
             endpoint_type::m_elog.write(log::elevel::rerror,
                     "handle_connect error: "+ec.message());
         } else {
             endpoint_type::m_alog.write(log::alevel::connect,
                 "Successful connection");
-            
+
             con->start();
         }
     }
diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp
index aa081ae109..f2bb7efb0f 100644
--- a/websocketpp/roles/server_endpoint.hpp
+++ b/websocketpp/roles/server_endpoint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_SERVER_ENDPOINT_HPP
@@ -44,13 +44,13 @@ template <typename config>
 class server : public endpoint<connection<config>,config> {
 public:
     /// Type of this endpoint
-    typedef server<config> type;    
-    
+    typedef server<config> type;
+
     /// Type of the endpoint concurrency component
     typedef typename config::concurrency_type concurrency_type;
     /// Type of the endpoint transport component
     typedef typename config::transport_type transport_type;
-    
+
     /// Type of the connections this server will create
     typedef connection<config> connection_type;
     /// Type of a shared pointer to the connections this server will create
@@ -63,8 +63,8 @@ public:
 
     /// Type of the endpoint component of this server
     typedef endpoint<connection_type,config> endpoint_type;
-    
-    
+
+
     // TODO: clean up these types
 
     explicit server() : endpoint_type(true)
@@ -72,19 +72,19 @@ public:
         endpoint_type::m_alog.write(log::alevel::devel,
             "server constructor");
     }
-    
-    // return an initialized connection_ptr. Call start() on this object to 
+
+    // return an initialized connection_ptr. Call start() on this object to
     // begin the processing loop.
     connection_ptr get_connection() {
         connection_ptr con = endpoint_type::create_connection();
-                
+
         return con;
     }
-    
+
     // Starts the server's async connection acceptance loop.
     void start_accept() {
         connection_ptr con = get_connection();
-        
+
         transport_type::async_accept(
             lib::static_pointer_cast<transport_con_type>(con),
             lib::bind(
@@ -95,11 +95,11 @@ public:
             )
         );
     }
-    
+
     void handle_accept(connection_hdl hdl, const lib::error_code& ec) {
         lib::error_code hdl_ec;
         connection_ptr con = endpoint_type::get_con_from_hdl(hdl,hdl_ec);
-        
+
         if (hdl_ec == error::bad_connection) {
             // The connection we were trying to connect went out of scope
             // This really shouldn't happen
@@ -122,7 +122,7 @@ public:
                 con->start();
             }
         }
-        
+
         // TODO: are there cases where we should terminate this loop?
         start_accept();
     }
diff --git a/websocketpp/server.hpp b/websocketpp/server.hpp
index 640030c8fe..50d33d10e0 100644
--- a/websocketpp/server.hpp
+++ b/websocketpp/server.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_SERVER_HPP
@@ -30,4 +30,4 @@
 
 #include <websocketpp/roles/server_endpoint.hpp>
 
-#endif //WEBSOCKETPP_SERVER_HPP
\ No newline at end of file
+#endif //WEBSOCKETPP_SERVER_HPP
diff --git a/websocketpp/sha1/license.txt b/websocketpp/sha1/license.txt
index 8d7f3941cf..8401f0ed31 100755
--- a/websocketpp/sha1/license.txt
+++ b/websocketpp/sha1/license.txt
@@ -4,11 +4,11 @@ Paul E. Jones <paulej@packetizer.com>
 Freeware Public License (FPL)
 
 This software is licensed as "freeware."  Permission to distribute
-this software in source and binary forms, including incorporation 
-into other products, is hereby granted without a fee.  THIS SOFTWARE 
-IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES, 
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD 
-LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER 
-DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA 
+this software in source and binary forms, including incorporation
+into other products, is hereby granted without a fee.  THIS SOFTWARE
+IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD
+LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER
+DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA
 OR DATA BEING RENDERED INACCURATE.
diff --git a/websocketpp/sha1/sha1.hpp b/websocketpp/sha1/sha1.hpp
index 05828893b0..154196aced 100755
--- a/websocketpp/sha1/sha1.hpp
+++ b/websocketpp/sha1/sha1.hpp
@@ -6,20 +6,20 @@
  * All Rights Reserved.
  *
  * Modifications were done in 2012-13 by Peter Thorson (webmaster@zaphoyd.com)
- * to allow header only usage of the library and use C++ features to better 
+ * to allow header only usage of the library and use C++ features to better
  * support C++ usage. These changes are distributed under the original freeware
  * license included below
  *
  * Freeware Public License (FPL)
  *
  * This software is licensed as "freeware."  Permission to distribute
- * this software in source and binary forms, including incorporation 
- * into other products, is hereby granted without a fee.  THIS SOFTWARE 
- * IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES, 
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD 
- * LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER 
- * DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA 
+ * this software in source and binary forms, including incorporation
+ * into other products, is hereby granted without a fee.  THIS SOFTWARE
+ * IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD
+ * LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER
+ * DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA
  * OR DATA BEING RENDERED INACCURATE.
  *
  *****************************************************************************
@@ -78,20 +78,20 @@ public:
         length_low = 0;
         length_high = 0;
         message_block_index = 0;
-    
+
         H[0] = 0x67452301;
         H[1] = 0xEFCDAB89;
         H[2] = 0x98BADCFE;
         H[3] = 0x10325476;
         H[4] = 0xC3D2E1F0;
-    
+
         computed = false;
         corrupted = false;
     }
 
     /// Extract the message digest as a raw integer array
     /**
-     * @param [out] message_digest_array Integer array to store the message in 
+     * @param [out] message_digest_array Integer array to store the message in
      * @return Whether or not the extraction was sucessful
      */
     bool get_raw_digest(uint32_t * message_digest_array) {
@@ -107,7 +107,7 @@ public:
         for (int i = 0; i < 5; i++) {
             message_digest_array[i] = H[i];
         }
- 
+
         return true;
     }
 
@@ -120,16 +120,16 @@ public:
         if (!length) {
             return;
         }
-    
+
         if (computed || corrupted) {
             corrupted = true;
             return;
         }
-    
+
         while (length-- && !corrupted) {
 // Suppresses Visual Studio code analysis for write overrun. It doesn't know the
 // index into Message_Block is protected by checking length.
-// 
+//
 // TODO: is there a more compatible way to write the original code to avoid
 //       this sort of warning?
 #ifdef _MSC_VER
@@ -140,7 +140,7 @@ public:
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-    
+
             length_low += 8;
             length_low &= 0xFFFFFFFF;               // Force it to 32 bits
             if (length_low == 0) {
@@ -150,15 +150,15 @@ public:
                     corrupted = true;               // Message is too long
                 }
             }
-    
+
             if (message_block_index == 64) {
                 process_message_block();
             }
-    
+
             message_array++;
         }
     }
-    
+
     /// Provide input to SHA1
     /**
      * Overload with signed message array
@@ -179,7 +179,7 @@ public:
     void input(unsigned char message_element) {
         input(&message_element, 1);
     }
-    
+
     /// Provide input to SHA1
     /**
      * Overload with a single signed char
@@ -198,12 +198,12 @@ public:
      */
     sha1& operator<<(char const * message_array) {
         char const * p = message_array;
-    
+
         while(*p) {
             input(*p);
             p++;
         }
-    
+
         return *this;
     }
 
@@ -220,7 +220,7 @@ public:
             input(*p);
             p++;
         }
-    
+
         return *this;
     }
 
@@ -263,7 +263,7 @@ private:
         uint32_t temp;          // Temporary word value
         uint32_t W[80];         // Word sequence
         uint32_t A, B, C, D, E; // Word buffers
-    
+
         // Initialize the first 16 words in the array W
         for (int t = 0; t < 16; t++) {
             W[t] = ((uint32_t) message_block[t * 4]) << 24;
@@ -271,17 +271,17 @@ private:
             W[t] |= ((uint32_t) message_block[t * 4 + 2]) << 8;
             W[t] |= ((uint32_t) message_block[t * 4 + 3]);
         }
-    
+
         for (int t = 16; t < 80; t++) {
            W[t] = CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
         }
-    
+
         A = H[0];
         B = H[1];
         C = H[2];
         D = H[3];
         E = H[4];
-    
+
         for (int t = 0; t < 20; t++) {
             temp = CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0];
             temp &= 0xFFFFFFFF;
@@ -291,7 +291,7 @@ private:
             B = A;
             A = temp;
         }
-    
+
         for (int t = 20; t < 40; t++) {
             temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
             temp &= 0xFFFFFFFF;
@@ -301,7 +301,7 @@ private:
             B = A;
             A = temp;
         }
-    
+
         for (int t = 40; t < 60; t++) {
             temp = CircularShift(5,A) +
                    ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
@@ -312,7 +312,7 @@ private:
             B = A;
             A = temp;
         }
-    
+
         for (int t = 60; t < 80; t++) {
             temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
             temp &= 0xFFFFFFFF;
@@ -322,13 +322,13 @@ private:
             B = A;
             A = temp;
         }
-    
+
         H[0] = (H[0] + A) & 0xFFFFFFFF;
         H[1] = (H[1] + B) & 0xFFFFFFFF;
         H[2] = (H[2] + C) & 0xFFFFFFFF;
         H[3] = (H[3] + D) & 0xFFFFFFFF;
         H[4] = (H[4] + E) & 0xFFFFFFFF;
-    
+
         message_block_index = 0;
     }
 
@@ -351,9 +351,9 @@ private:
             while(message_block_index < 64) {
                 message_block[message_block_index++] = 0;
             }
-    
+
             process_message_block();
-    
+
             while(message_block_index < 56) {
                 message_block[message_block_index++] = 0;
             }
@@ -362,9 +362,9 @@ private:
             while(message_block_index < 56) {
                 message_block[message_block_index++] = 0;
             }
-    
+
         }
-    
+
         // Store the message length as the last 8 octets
         message_block[56] = (length_high >> 24) & 0xFF;
         message_block[57] = (length_high >> 16) & 0xFF;
@@ -374,7 +374,7 @@ private:
         message_block[61] = (length_low >> 16) & 0xFF;
         message_block[62] = (length_low >> 8) & 0xFF;
         message_block[63] = (length_low) & 0xFF;
-    
+
         process_message_block();
     }
 
diff --git a/websocketpp/transport/asio/base.hpp b/websocketpp/transport/asio/base.hpp
index a63d5ab835..2401dff662 100644
--- a/websocketpp/transport/asio/base.hpp
+++ b/websocketpp/transport/asio/base.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_ASIO_BASE_HPP
@@ -74,7 +74,7 @@ public:
     char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
         return "websocketpp.transport.asio";
     }
-    
+
     std::string message(int value) const {
         switch(value) {
             case error::general:
diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
index 42defb6bce..e775dd38c6 100644
--- a/websocketpp/transport/asio/connection.hpp
+++ b/websocketpp/transport/asio/connection.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
@@ -73,17 +73,17 @@ public:
     typedef typename config::alog_type alog_type;
     /// Type of this transport's error logging policy
     typedef typename config::elog_type elog_type;
-    
+
     typedef typename config::request_type request_type;
     typedef typename request_type::ptr request_ptr;
     typedef typename config::response_type response_type;
     typedef typename response_type::ptr response_ptr;
-    
+
     /// Type of a pointer to the ASIO io_service being used
-    typedef boost::asio::io_service* io_service_ptr;    
+    typedef boost::asio::io_service* io_service_ptr;
     /// Type of a pointer to the ASIO timer class
     typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
-    
+
     // generate and manage our own io_service
     explicit connection(bool is_server, alog_type& alog, elog_type& elog)
       : m_is_server(is_server)
@@ -92,11 +92,11 @@ public:
     {
         m_alog.write(log::alevel::devel,"asio con transport constructor");
     }
-    
+
     bool is_secure() const {
         return socket_con_type::is_secure();
     }
-    
+
     /// Finish constructing the transport
     /**
      * init_asio is called once immediately after construction to initialize
@@ -116,22 +116,22 @@ public:
         m_io_service = io_service;
 
         //m_strand.reset(new boost::asio::strand(*io_service));
-        
+
         return socket_con_type::init_asio(io_service, m_is_server);
     }
 
     void set_tcp_init_handler(tcp_init_handler h) {
         m_tcp_init_handler = h;
     }
-    
+
     /// Set the proxy to connect through (exception free)
     /**
      * The URI passed should be a complete URI including scheme. For example:
      * http://proxy.example.com:8080/
-     * 
-     * The proxy must be set up as an explicit (CONNECT) proxy allowed to 
+     *
+     * The proxy must be set up as an explicit (CONNECT) proxy allowed to
      * connect to the port you specify. Traffic to the proxy is not encrypted.
-     * 
+     *
      * @param uri The full URI of the proxy to connect to.
      *
      * @param ec A status value
@@ -143,58 +143,58 @@ public:
         m_proxy_data.reset(new proxy_data());
         ec = lib::error_code();
     }
-    
+
     /// Set the proxy to connect through (exception)
     void set_proxy(const std::string & uri) {
         lib::error_code ec;
         set_proxy(uri,ec);
         if (ec) { throw ec; }
     }
-    
+
     /// Set the basic auth credentials to use (exception free)
     /**
      * The URI passed should be a complete URI including scheme. For example:
      * http://proxy.example.com:8080/
-     * 
-     * The proxy must be set up as an explicit proxy 
-     * 
+     *
+     * The proxy must be set up as an explicit proxy
+     *
      * @param username The username to send
-     * 
+     *
      * @param password The password to send
      *
      * @param ec A status value
      */
-    void set_proxy_basic_auth(const std::string & username, const 
+    void set_proxy_basic_auth(const std::string & username, const
         std::string & password, lib::error_code & ec)
     {
         if (!m_proxy_data) {
             ec = make_error_code(websocketpp::error::invalid_state);
             return;
         }
-        
+
         // TODO: username can't contain ':'
         std::string val = "Basic "+base64_encode(username + ":" + password);
         m_proxy_data->req.replace_header("Proxy-Authorization",val);
         ec = lib::error_code();
     }
-    
+
     /// Set the basic auth credentials to use (exception)
-    void set_proxy_basic_auth(const std::string & username, const 
+    void set_proxy_basic_auth(const std::string & username, const
         std::string & password)
     {
         lib::error_code ec;
         set_proxy_basic_auth(username,password,ec);
         if (ec) { throw ec; }
     }
-    
+
     /// Set the proxy timeout duration (exception free)
     /**
-     * Duration is in milliseconds. Default value is based on the transport 
+     * Duration is in milliseconds. Default value is based on the transport
      * config
-     * 
+     *
      * @param duration The number of milliseconds to wait before aborting the
      * proxy connection.
-     * 
+     *
      * @param ec A status value
      */
     void set_proxy_timeout(long duration, lib::error_code & ec) {
@@ -202,26 +202,26 @@ public:
             ec = make_error_code(websocketpp::error::invalid_state);
             return;
         }
-        
+
         m_proxy_data->timeout_proxy = duration;
         ec = lib::error_code();
     }
-    
+
     /// Set the proxy timeout duration (exception)
     void set_proxy_timeout(long duration) {
         lib::error_code ec;
         set_proxy_timeout(duration,ec);
         if (ec) { throw ec; }
     }
-    
+
     const std::string & get_proxy() const {
         return m_proxy;
     }
 
     /// Get the remote endpoint address
     /**
-     * The iostream transport has no information about the ultimate remote 
-     * endpoint. It will return the string "iostream transport". To indicate 
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
      * this.
      *
      * TODO: allow user settable remote endpoint addresses if this seems useful
@@ -230,9 +230,9 @@ public:
      */
     std::string get_remote_endpoint() const {
         lib::error_code ec;
-        
+
         std::string ret = socket_con_type::get_remote_endpoint(ec);
-        
+
         if (ec) {
             m_elog.write(log::elevel::info,ret);
             return "Unknown";
@@ -240,12 +240,12 @@ public:
             return ret;
         }
     }
-    
+
     /// Get the connection handle
     connection_hdl get_handle() const {
         return m_connection_hdl;
     }
-    
+
     /// initialize the proxy buffers and http parsers
     /**
      *
@@ -265,14 +265,14 @@ public:
 
         return lib::error_code();
     }
-    
+
     /// Call back a function after a period of time.
     /**
      * Sets a timer that calls back a function after the specified period of
      * milliseconds. Returns a handle that can be used to cancel the timer.
      * A cancelled timer will return the error code error::operation_aborted
      * A timer that expired will return no error.
-     * 
+     *
      * @param duration Length of time to wait in milliseconds
      *
      * @param callback The function to call back when the timer has expired
@@ -297,30 +297,30 @@ public:
                 lib::placeholders::_1
             )
         );
-        
+
         return new_timer;
     }
-    
+
     /// Timer callback
     /**
      * The timer pointer is included to ensure the timer isn't destroyed until
      * after it has expired.
-     * 
+     *
      * @param t Pointer to the timer in question
      *
      * @param callback The function to call back
      *
      * @param ec The status code
      */
-    void handle_timer(timer_ptr t, timer_handler callback, const 
+    void handle_timer(timer_ptr t, timer_handler callback, const
         boost::system::error_code& ec)
     {
         if (ec) {
             if (ec == boost::asio::error::operation_aborted) {
-                callback(make_error_code(transport::error::operation_aborted)); 
+                callback(make_error_code(transport::error::operation_aborted));
             } else {
                 log_err(log::elevel::info,"asio handle_timer",ec);
-                callback(make_error_code(error::pass_through)); 
+                callback(make_error_code(error::pass_through));
             }
         } else {
             callback(lib::error_code());
@@ -335,20 +335,20 @@ protected:
      * The transport initialization sequence consists of the following steps:
      * - Pre-init: the underlying socket is initialized to the point where
      * bytes may be written. No bytes are actually written in this stage
-     * - Proxy negotiation: if a proxy is set, a request is made to it to start 
-     * a tunnel to the final destination. This stage ends when the proxy is 
+     * - Proxy negotiation: if a proxy is set, a request is made to it to start
+     * a tunnel to the final destination. This stage ends when the proxy is
      * ready to forward the
      * next byte to the remote endpoint.
      * - Post-init: Perform any i/o with the remote endpoint, such as setting up
-     * tunnels for encryption. This stage ends when the connection is ready to 
-     * read or write the WebSocket handshakes. At this point the original 
+     * tunnels for encryption. This stage ends when the connection is ready to
+     * read or write the WebSocket handshakes. At this point the original
      * callback function is called.
      */
     void init(init_handler callback) {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection init");
         }
-        
+
         // TODO: pre-init timeout. Right now no implemented socket policies
         // actually have an asyncronous pre-init
 
@@ -361,21 +361,21 @@ protected:
             )
         );
     }
-    
+
     void handle_pre_init(init_handler callback, const lib::error_code& ec) {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection handle pre_init");
         }
-        
+
         if (m_tcp_init_handler) {
             m_tcp_init_handler(m_connection_hdl);
         }
-        
+
         if (ec) {
             callback(ec);
         }
-        
-        // If we have a proxy set issue a proxy connect, otherwise skip to 
+
+        // If we have a proxy set issue a proxy connect, otherwise skip to
         // post_init
         if (!m_proxy.empty()) {
             proxy_write(callback);
@@ -383,12 +383,12 @@ protected:
             post_init(callback);
         }
     }
-    
+
     void post_init(init_handler callback) {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection post_init");
         }
-        
+
         timer_ptr post_timer;
         post_timer = set_timer(
             config::timeout_socket_post_init,
@@ -411,15 +411,15 @@ protected:
             )
         );
     }
-    
-    void handle_post_init_timeout(timer_ptr post_timer, init_handler callback, 
-        const lib::error_code& ec) 
+
+    void handle_post_init_timeout(timer_ptr post_timer, init_handler callback,
+        const lib::error_code& ec)
     {
         lib::error_code ret_ec;
 
         if (ec) {
             if (ec == transport::error::operation_aborted) {
-                m_alog.write(log::alevel::devel, 
+                m_alog.write(log::alevel::devel,
                     "asio post init timer cancelled");
                 return;
             }
@@ -439,44 +439,44 @@ protected:
         callback(ret_ec);
     }
 
-    void handle_post_init(timer_ptr post_timer, init_handler callback, const 
-        lib::error_code& ec) 
+    void handle_post_init(timer_ptr post_timer, init_handler callback, const
+        lib::error_code& ec)
     {
-        if (ec == transport::error::operation_aborted || 
+        if (ec == transport::error::operation_aborted ||
             post_timer->expires_from_now().is_negative())
         {
             m_alog.write(log::alevel::devel,"post_init cancelled");
             return;
         }
-        
+
         post_timer->cancel();
 
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection handle_post_init");
         }
-        
+
         callback(ec);
     }
-    
+
     void proxy_write(init_handler callback) {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection proxy_write");
         }
-        
+
         if (!m_proxy_data) {
             m_elog.write(log::elevel::library,
                 "assertion failed: !m_proxy_data in asio::connection::proxy_write");
             callback(make_error_code(error::general));
             return;
         }
-        
+
         m_proxy_data->write_buf = m_proxy_data->req.raw();
-        
+
         m_bufs.push_back(boost::asio::buffer(m_proxy_data->write_buf.data(),
                                              m_proxy_data->write_buf.size()));
-        
+
         m_alog.write(log::alevel::devel,m_proxy_data->write_buf);
-        
+
         // Set a timer so we don't wait forever for the proxy to respond
         m_proxy_data->timer = this->set_timer(
             m_proxy_data->timeout_proxy,
@@ -487,7 +487,7 @@ protected:
                 lib::placeholders::_1
             )
         );
-        
+
         // Send proxy request
         boost::asio::async_write(
             socket_con_type::get_next_layer(),
@@ -500,7 +500,7 @@ protected:
             )
         );
     }
-    
+
     void handle_proxy_timeout(init_handler callback, const lib::error_code & ec) {
         if (ec == transport::error::operation_aborted) {
             m_alog.write(log::alevel::devel,
@@ -516,41 +516,41 @@ protected:
             callback(make_error_code(transport::error::timeout));
         }
     }
-    
-    void handle_proxy_write(init_handler callback, const 
+
+    void handle_proxy_write(init_handler callback, const
         boost::system::error_code& ec)
     {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection handle_proxy_write");
         }
-        
+
         m_bufs.clear();
-        
+
         // Timer expired or the operation was aborted for some reason.
         // Whatever aborted it will be issuing the callback so we are safe to
         // return
-        if (ec == boost::asio::error::operation_aborted || 
+        if (ec == boost::asio::error::operation_aborted ||
             m_proxy_data->timer->expires_from_now().is_negative())
         {
             m_elog.write(log::elevel::devel,"write operation aborted");
             return;
         }
-        
+
         if (ec) {
             log_err(log::elevel::info,"asio handle_proxy_write",ec);
             m_proxy_data->timer->cancel();
             callback(make_error_code(error::pass_through));
             return;
         }
-        
+
         proxy_read(callback);
     }
-    
+
     void proxy_read(init_handler callback) {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection proxy_read");
         }
-        
+
         if (!m_proxy_data) {
             m_elog.write(log::elevel::library,
                 "assertion failed: !m_proxy_data in asio::connection::proxy_read");
@@ -558,7 +558,7 @@ protected:
             callback(make_error_code(error::general));
             return;
         }
-        
+
         boost::asio::async_read_until(
             socket_con_type::get_next_layer(),
             m_proxy_data->read_buf,
@@ -572,31 +572,31 @@ protected:
             )
         );
     }
-    
-    void handle_proxy_read(init_handler callback, const 
+
+    void handle_proxy_read(init_handler callback, const
         boost::system::error_code& ec, size_t bytes_transferred)
     {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection handle_proxy_read");
         }
-        
+
         // Timer expired or the operation was aborted for some reason.
         // Whatever aborted it will be issuing the callback so we are safe to
         // return
-        if (ec == boost::asio::error::operation_aborted || 
+        if (ec == boost::asio::error::operation_aborted ||
             m_proxy_data->timer->expires_from_now().is_negative())
         {
             m_elog.write(log::elevel::devel,"read operation aborted");
             return;
         }
-        
+
         // At this point there is no need to wait for the timer anymore
         m_proxy_data->timer->cancel();
-        
+
         if (ec) {
             m_elog.write(log::elevel::info,
                 "asio handle_proxy_read error: "+ec.message());
-            callback(make_error_code(error::pass_through)); 
+            callback(make_error_code(error::pass_through));
         } else {
             if (!m_proxy_data) {
                 m_elog.write(log::elevel::library,
@@ -604,11 +604,11 @@ protected:
                 callback(make_error_code(error::general));
                 return;
             }
-            
+
             std::istream input(&m_proxy_data->read_buf);
 
             m_proxy_data->res.consume(input);
-            
+
             if (!m_proxy_data->res.headers_ready()) {
                 // we read until the headers were done in theory but apparently
                 // they aren't. Internal endpoint error.
@@ -623,7 +623,7 @@ protected:
                 // TODO: expose this error in a programmatically accessible way?
                 // if so, see below for an option on how to do this.
                 std::stringstream s;
-                s << "Proxy connection error: " 
+                s << "Proxy connection error: "
                   << m_proxy_data->res.get_status_code()
                   << " ("
                   << m_proxy_data->res.get_status_msg()
@@ -632,14 +632,14 @@ protected:
                 callback(make_error_code(error::proxy_failed));
                 return;
             }
-            
+
             // we have successfully established a connection to the proxy, now
-            // we can continue and the proxy will transparently forward the 
+            // we can continue and the proxy will transparently forward the
             // WebSocket connection.
 
             // TODO: decide if we want an on_proxy callback that would allow
             // access to the proxy response.
-            
+
             // free the proxy buffers and req/res objects as they aren't needed
             // anymore
             m_proxy_data.reset();
@@ -648,13 +648,13 @@ protected:
             post_init(callback);
         }
     }
-    
-    /// read at least num_bytes bytes into buf and then call handler. 
+
+    /// read at least num_bytes bytes into buf and then call handler.
     /**
-     * 
-     * 
+     *
+     *
      */
-    void async_read_at_least(size_t num_bytes, char *buf, size_t len, 
+    void async_read_at_least(size_t num_bytes, char *buf, size_t len,
         read_handler handler)
     {
         if (m_alog.static_test(log::alevel::devel)) {
@@ -662,7 +662,7 @@ protected:
             s << "asio async_read_at_least: " << num_bytes;
             m_alog.write(log::alevel::devel,s.str());
         }
-        
+
         if (num_bytes > len) {
             m_elog.write(log::elevel::devel,
                 "asio async_read_at_least error::invalid_num_bytes");
@@ -670,7 +670,7 @@ protected:
                 size_t(0));
             return;
         }
-        
+
         boost::asio::async_read(
             socket_con_type::get_socket(),
             boost::asio::buffer(buf,len),
@@ -684,32 +684,32 @@ protected:
             )
         );
     }
-    
-    void handle_async_read(read_handler handler, const 
+
+    void handle_async_read(read_handler handler, const
         boost::system::error_code& ec, size_t bytes_transferred)
     {
         if (!ec) {
             handler(lib::error_code(), bytes_transferred);
             return;
         }
-        
+
         // translate boost error codes into more lib::error_codes
         if (ec == boost::asio::error::eof) {
-            handler(make_error_code(transport::error::eof), 
-            bytes_transferred); 
+            handler(make_error_code(transport::error::eof),
+            bytes_transferred);
         } else if (ec.value() == 335544539) {
-            handler(make_error_code(transport::error::tls_short_read), 
-            bytes_transferred); 
+            handler(make_error_code(transport::error::tls_short_read),
+            bytes_transferred);
         } else {
             log_err(log::elevel::info,"asio async_read_at_least",ec);
-            handler(make_error_code(transport::error::pass_through), 
+            handler(make_error_code(transport::error::pass_through),
                 bytes_transferred);
         }
     }
-    
+
     void async_write(const char* buf, size_t len, write_handler handler) {
         m_bufs.push_back(boost::asio::buffer(buf,len));
-        
+
         boost::asio::async_write(
             socket_con_type::get_socket(),
             m_bufs,
@@ -721,14 +721,14 @@ protected:
             )
         );
     }
-    
+
     void async_write(const std::vector<buffer>& bufs, write_handler handler) {
         std::vector<buffer>::const_iterator it;
 
         for (it = bufs.begin(); it != bufs.end(); ++it) {
             m_bufs.push_back(boost::asio::buffer((*it).buf,(*it).len));
         }
-        
+
         boost::asio::async_write(
             socket_con_type::get_socket(),
             m_bufs,
@@ -741,7 +741,7 @@ protected:
         );
     }
 
-    void handle_async_write(write_handler handler, const 
+    void handle_async_write(write_handler handler, const
         boost::system::error_code& ec)
     {
         m_bufs.clear();
@@ -752,19 +752,19 @@ protected:
             handler(lib::error_code());
         }
     }
-    
+
     /// Set Connection Handle
     /**
      * See common/connection_hdl.hpp for information
-     * 
-     * @param hdl A connection_hdl that the transport will use to refer 
+     *
+     * @param hdl A connection_hdl that the transport will use to refer
      * to itself
      */
     void set_handle(connection_hdl hdl) {
         m_connection_hdl = hdl;
         socket_con_type::set_handle(hdl);
     }
-    
+
     /// Trigger the on_interrupt handler
     /**
      * This needs to be thread safe
@@ -775,22 +775,22 @@ protected:
         m_io_service->post(handler);
         return lib::error_code();
     }
-    
+
     lib::error_code dispatch(dispatch_handler handler) {
         m_io_service->post(handler);
         return lib::error_code();
     }
 
-    /*void handle_interrupt(interrupt_handler handler) { 
+    /*void handle_interrupt(interrupt_handler handler) {
         handler();
     }*/
-    
+
     /// close and clean up the underlying socket
     void async_shutdown(shutdown_handler callback) {
         if (m_alog.static_test(log::alevel::devel)) {
             m_alog.write(log::alevel::devel,"asio connection async_shutdown");
         }
-        
+
         timer_ptr shutdown_timer;
         shutdown_timer = set_timer(
             config::timeout_socket_shutdown,
@@ -813,15 +813,15 @@ protected:
             )
         );
     }
-    
-    void handle_async_shutdown_timeout(timer_ptr shutdown_timer, init_handler 
-        callback, const lib::error_code& ec) 
+
+    void handle_async_shutdown_timeout(timer_ptr shutdown_timer, init_handler
+        callback, const lib::error_code& ec)
     {
         lib::error_code ret_ec;
 
         if (ec) {
             if (ec == transport::error::operation_aborted) {
-                m_alog.write(log::alevel::devel, 
+                m_alog.write(log::alevel::devel,
                     "asio socket shutdown timer cancelled");
                 return;
             }
@@ -838,23 +838,23 @@ protected:
         callback(ret_ec);
     }
 
-    void handle_async_shutdown(timer_ptr shutdown_timer, shutdown_handler 
+    void handle_async_shutdown(timer_ptr shutdown_timer, shutdown_handler
         callback, const boost::system::error_code & ec)
     {
-        if (ec == boost::asio::error::operation_aborted || 
+        if (ec == boost::asio::error::operation_aborted ||
             shutdown_timer->expires_from_now().is_negative())
         {
             m_alog.write(log::alevel::devel,"async_shutdown cancelled");
             return;
         }
-        
+
         shutdown_timer->cancel();
 
         if (ec) {
             log_err(log::elevel::info,"asio async_shutdown",ec);
             if (ec == boost::asio::error::not_connected) {
                 // The socket was already closed when we tried to close it. This
-                // happens periodically (usually if a read or write fails 
+                // happens periodically (usually if a read or write fails
                 // earlier and if it is a real error will be caught at another
                 // level of the stack.
                 callback(lib::error_code());
@@ -866,7 +866,7 @@ protected:
                 m_alog.write(log::alevel::devel,
                     "asio con handle_async_shutdown");
             }
-            
+
             callback(lib::error_code());
         }
     }
@@ -878,15 +878,15 @@ private:
         s << msg << " error: " << ec << " (" << ec.message() << ")";
         m_elog.write(l,s.str());
     }
-    
+
     // static settings
     const bool m_is_server;
     alog_type& m_alog;
     elog_type& m_elog;
-    
+
     struct proxy_data {
         proxy_data() : timeout_proxy(config::timeout_proxy) {}
-        
+
         request_type req;
         response_type res;
         std::string write_buf;
@@ -894,10 +894,10 @@ private:
         long timeout_proxy;
         timer_ptr timer;
     };
-    
+
     std::string m_proxy;
     lib::shared_ptr<proxy_data> m_proxy_data;
-    
+
     // transport resources
     io_service_ptr      m_io_service;
     connection_hdl      m_connection_hdl;
diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
index 8258cc6eb0..59fd6530c0 100644
--- a/websocketpp/transport/asio/endpoint.hpp
+++ b/websocketpp/transport/asio/endpoint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_ASIO_HPP
@@ -37,7 +37,7 @@
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
 #include <boost/system/error_code.hpp>
-    
+
 #include <iostream>
 
 namespace websocketpp {
@@ -68,14 +68,14 @@ public:
     typedef typename socket_type::socket_con_type socket_con_type;
     /// Type of a shared pointer to the socket connection component
     typedef typename socket_con_type::ptr socket_con_ptr;
-    
+
     /// Type of the connection transport component associated with this
     /// endpoint transport component
     typedef asio::connection<config> transport_con_type;
     /// Type of a shared pointer to the connection transport component
     /// associated with this endpoint transport component
     typedef typename transport_con_type::ptr transport_con_ptr;
-    
+
     /// Type of a pointer to the ASIO io_service being used
     typedef boost::asio::io_service* io_service_ptr;
     /// Type of a shared pointer to the acceptor being used
@@ -84,15 +84,15 @@ public:
     typedef lib::shared_ptr<boost::asio::ip::tcp::resolver> resolver_ptr;
     /// Type of timer handle
     typedef lib::shared_ptr<boost::asio::deadline_timer> timer_ptr;
-    
+
     // generate and manage our own io_service
-    explicit endpoint() 
+    explicit endpoint()
       : m_external_io_service(false)
       , m_state(UNINITIALIZED)
     {
-        //std::cout << "transport::asio::endpoint constructor" << std::endl; 
+        //std::cout << "transport::asio::endpoint constructor" << std::endl;
     }
-    
+
     ~endpoint() {
         // clean up our io_service if we were initialized with an internal one.
         m_acceptor.reset();
@@ -126,14 +126,14 @@ public:
         src.m_acceptor = NULL;
         src.m_state = UNINITIALIZED;
     }
-    
+
     endpoint& operator= (const endpoint && rhs) {
         if (this != &rhs) {
             m_io_service = rhs.m_io_service;
             m_external_io_service = rhs.m_external_io_service;
             m_acceptor = rhs.m_acceptor;
             m_state = rhs.m_state;
-            
+
             rhs.m_io_service = NULL;
             rhs.m_external_io_service = false;
             rhs.m_acceptor = NULL;
@@ -142,10 +142,10 @@ public:
         return *this;
     }
 #endif
-    
+
     /// initialize asio transport with external io_service
     /**
-     * Initialize the ASIO transport policy for this endpoint using the 
+     * Initialize the ASIO transport policy for this endpoint using the
      * io_service object. asio_init must be called exactly once on any endpoint
      * that uses transport::asio before it can be used.
      *
@@ -158,15 +158,15 @@ public:
                 "asio::init_asio called from the wrong state");
             throw;
         }
-        
+
         m_alog->write(log::alevel::devel,"asio::init_asio");
-        
+
         m_io_service = ptr;
         m_external_io_service = true;
         m_acceptor.reset(new boost::asio::ip::tcp::acceptor(*m_io_service));
         m_state = READY;
     }
-    
+
     /// Initialize asio transport with internal io_service
     /**
      * @see init_asio(io_service_ptr ptr)
@@ -175,10 +175,10 @@ public:
         init_asio(new boost::asio::io_service());
         m_external_io_service = false;
     }
-    
+
     /// Sets the tcp init handler
     /**
-     * The tcp init handler is called after the tcp connection has been 
+     * The tcp init handler is called after the tcp connection has been
      * established.
      *
      * @see WebSocket++ handler documentation for more information about
@@ -196,31 +196,31 @@ public:
                 "asio::listen called from the wrong state");
             throw;
         }
-        
+
         m_alog->write(log::alevel::devel,"asio::listen");
-        
+
         m_acceptor->open(e.protocol());
         m_acceptor->set_option(boost::asio::socket_base::reuse_address(true));
         m_acceptor->bind(e);
         m_acceptor->listen();
         m_state = LISTENING;
-        
+
         m_alog->write(log::alevel::devel,"mark");
     }
-    
+
     void cancel() {
         if (m_state != LISTENING) {
             // TODO
             throw;
         }
-        
+
         // TODO: figure out if this is a good way to stop listening.
         m_acceptor->cancel();
         m_acceptor->close();
     }
 
     // Accept the next connection attempt via m_acceptor and assign it to con.
-    // callback is called 
+    // callback is called
     void async_accept(transport_con_ptr tcon, accept_handler callback) {
         if (m_state != LISTENING) {
             // TODO: throw invalid state
@@ -228,9 +228,9 @@ public:
                 "asio::async_accept called from the wrong state");
             throw;
         }
-        
+
         m_alog->write(log::alevel::devel, "asio::async_accept");
-        
+
         // TEMP
         m_acceptor->async_accept(
             tcon->get_raw_socket(),
@@ -248,48 +248,48 @@ public:
     std::size_t run() {
         return m_io_service->run();
     }
-    
+
     /// wraps the run_one method of the internal io_service object
     std::size_t run_one() {
         return m_io_service->run_one();
     }
-    
+
     /// wraps the stop method of the internal io_service object
     void stop() {
         m_io_service->stop();
     }
-    
+
     /// wraps the poll method of the internal io_service object
     std::size_t poll() {
         return m_io_service->poll();
     }
-    
+
     /// wraps the poll_one method of the internal io_service object
     std::size_t poll_one() {
         return m_io_service->poll_one();
     }
-    
+
     /// wraps the reset method of the internal io_service object
     void reset() {
         m_io_service->reset();
     }
-    
+
     /// wraps the stopped method of the internal io_service object
     bool stopped() const {
         return m_io_service->stopped();
     }
 
     // convenience methods
-    template <typename InternetProtocol> 
+    template <typename InternetProtocol>
     void listen(const InternetProtocol &internet_protocol, uint16_t port) {
         boost::asio::ip::tcp::endpoint e(internet_protocol, port);
         listen(e);
     }
-    
+
     void listen(uint16_t port) {
         listen(boost::asio::ip::tcp::v6(), port);
     }
-    
+
     void listen(const std::string &host, const std::string &service) {
         boost::asio::ip::tcp::resolver resolver(*m_io_service);
         boost::asio::ip::tcp::resolver::query query(host, service);
@@ -300,14 +300,14 @@ public:
         }
         listen(*endpoint_iterator);
     }
-    
+
     /// Call back a function after a period of time.
     /**
      * Sets a timer that calls back a function after the specified period of
      * milliseconds. Returns a handle that can be used to cancel the timer.
      * A cancelled timer will return the error code error::operation_aborted
      * A timer that expired will return no error.
-     * 
+     *
      * @param duration Length of time to wait in milliseconds
      *
      * @param callback The function to call back when the timer has expired
@@ -332,54 +332,54 @@ public:
                 lib::placeholders::_1
             )
         );
-        
+
         return new_timer;
     }
-    
+
     /// Timer callback
     /**
      * The timer pointer is included to ensure the timer isn't destroyed until
      * after it has expired.
-     * 
+     *
      * @param t Pointer to the timer in question
      *
      * @param callback The function to call back
      *
      * @param ec The status code
      */
-    void handle_timer(timer_ptr t, timer_handler callback, const 
+    void handle_timer(timer_ptr t, timer_handler callback, const
         boost::system::error_code& ec)
     {
         if (ec) {
             if (ec == boost::asio::error::operation_aborted) {
-                callback(make_error_code(transport::error::operation_aborted)); 
+                callback(make_error_code(transport::error::operation_aborted));
             } else {
                 m_elog->write(log::elevel::info,
                     "asio handle_timer error: "+ec.message());
                 log_err(log::elevel::info,"asio handle_timer",ec);
-                callback(make_error_code(error::pass_through)); 
+                callback(make_error_code(error::pass_through));
             }
         } else {
             callback(lib::error_code());
         }
     }
-    
+
     boost::asio::io_service& get_io_service() {
         return *m_io_service;
     }
-    
+
     bool is_secure() const {
         return socket_type::is_secure();
     }
 protected:
     /// Initialize logging
     /**
-     * The loggers are located in the main endpoint class. As such, the 
+     * The loggers are located in the main endpoint class. As such, the
      * transport doesn't have direct access to them. This method is called
      * by the endpoint constructor to allow shared logging from the transport
      * component. These are raw pointers to member variables of the endpoint.
      * In particular, they cannot be used in the transport constructor as they
-     * haven't been constructed yet, and cannot be used in the transport 
+     * haven't been constructed yet, and cannot be used in the transport
      * destructor as they will have been destroyed by then.
      */
     void init_logging(alog_type* a, elog_type* e) {
@@ -396,25 +396,25 @@ protected:
             callback(hdl,make_error_code(error::pass_through));
             return;
         }
-        
+
         //con->start();
         callback(hdl,lib::error_code());
     }
-    
+
     /// Initiate a new connection
     // TODO: there have to be some more failure conditions here
     void async_connect(transport_con_ptr tcon, uri_ptr u, connect_handler cb) {
         using namespace boost::asio::ip;
-        
+
         // Create a resolver
         if (!m_resolver) {
             m_resolver.reset(new boost::asio::ip::tcp::resolver(*m_io_service));
         }
-        
+
         std::string proxy = tcon->get_proxy();
         std::string host;
         std::string port;
-        
+
         if (proxy.empty()) {
             host = u->get_host();
             port = u->get_port_str();
@@ -422,7 +422,7 @@ protected:
             lib::error_code ec;
 
             uri_ptr pu(new uri(proxy));
-            
+
             if (!pu->get_valid()) {
                 cb(tcon->get_handle(),make_error_code(error::proxy_invalid));
                 return;
@@ -437,16 +437,16 @@ protected:
             host = pu->get_host();
             port = pu->get_port_str();
         }
-        
+
         tcp::resolver::query query(host,port);
-        
+
         if (m_alog->static_test(log::alevel::devel)) {
             m_alog->write(log::alevel::devel,
                 "starting async DNS resolve for "+host+":"+port);
         }
-        
+
         timer_ptr dns_timer;
-        
+
         dns_timer = set_timer(
             config::timeout_dns_resolve,
             lib::bind(
@@ -458,7 +458,7 @@ protected:
                 lib::placeholders::_1
             )
         );
-        
+
         m_resolver->async_resolve(
             query,
             lib::bind(
@@ -472,32 +472,32 @@ protected:
             )
         );
     }
-    
-    void handle_resolve_timeout(transport_con_ptr tcon, timer_ptr dns_timer, 
+
+    void handle_resolve_timeout(transport_con_ptr tcon, timer_ptr dns_timer,
         connect_handler callback, const lib::error_code & ec)
     {
         lib::error_code ret_ec;
-        
+
         if (ec) {
             if (ec == transport::error::operation_aborted) {
                 m_alog->write(log::alevel::devel,
                     "asio handle_resolve_timeout timer cancelled");
                 return;
             }
-            
+
             log_err(log::elevel::devel,"asio handle_resolve_timeout",ec);
             ret_ec = ec;
         } else {
             ret_ec = make_error_code(transport::error::timeout);
         }
-        
+
         m_alog->write(log::alevel::devel,"DNS resolution timed out");
         m_resolver->cancel();
         callback(tcon->get_handle(),ret_ec);
     }
-    
+
     void handle_resolve(transport_con_ptr tcon, timer_ptr dns_timer,
-        connect_handler callback, const boost::system::error_code& ec, 
+        connect_handler callback, const boost::system::error_code& ec,
         boost::asio::ip::tcp::resolver::iterator iterator)
     {
         if (ec == boost::asio::error::operation_aborted ||
@@ -506,31 +506,31 @@ protected:
             m_alog->write(log::alevel::devel,"async_resolve cancelled");
             return;
         }
-        
+
         dns_timer->cancel();
-        
+
         if (ec) {
             log_err(log::elevel::info,"asio async_resolve",ec);
             callback(tcon->get_handle(),make_error_code(error::pass_through));
             return;
         }
-        
+
         if (m_alog->static_test(log::alevel::devel)) {
             std::stringstream s;
             s << "Async DNS resolve successful. Results: ";
-            
+
             boost::asio::ip::tcp::resolver::iterator it, end;
             for (it = iterator; it != end; ++it) {
                 s << (*it).endpoint() << " ";
             }
-            
+
             m_alog->write(log::alevel::devel,s.str());
         }
-        
+
         m_alog->write(log::alevel::devel,"Starting async connect");
-        
+
         timer_ptr con_timer;
-        
+
         con_timer = set_timer(
             config::timeout_connect,
             lib::bind(
@@ -542,7 +542,7 @@ protected:
                 lib::placeholders::_1
             )
         );
-        
+
         boost::asio::async_connect(
             tcon->get_raw_socket(),
             iterator,
@@ -556,65 +556,65 @@ protected:
             )
         );
     }
-    
-    void handle_connect_timeout(transport_con_ptr tcon, timer_ptr con_timer, 
+
+    void handle_connect_timeout(transport_con_ptr tcon, timer_ptr con_timer,
         connect_handler callback, const lib::error_code & ec)
     {
         lib::error_code ret_ec;
-        
+
         if (ec) {
             if (ec == transport::error::operation_aborted) {
                 m_alog->write(log::alevel::devel,
                     "asio handle_connect_timeout timer cancelled");
                 return;
             }
-            
+
             log_err(log::elevel::devel,"asio handle_connect_timeout",ec);
             ret_ec = ec;
         } else {
             ret_ec = make_error_code(transport::error::timeout);
         }
-        
+
         m_alog->write(log::alevel::devel,"TCP connect timed out");
         tcon->cancel_socket();
         callback(tcon->get_handle(),ret_ec);
     }
-    
-    void handle_connect(transport_con_ptr tcon, timer_ptr con_timer, 
+
+    void handle_connect(transport_con_ptr tcon, timer_ptr con_timer,
         connect_handler callback, const boost::system::error_code& ec)
     {
-        if (ec == boost::asio::error::operation_aborted || 
+        if (ec == boost::asio::error::operation_aborted ||
             con_timer->expires_from_now().is_negative())
         {
             m_alog->write(log::alevel::devel,"async_connect cancelled");
             return;
         }
-        
+
         con_timer->cancel();
-        
+
         if (ec) {
             log_err(log::elevel::info,"asio async_connect",ec);
             callback(tcon->get_handle(),make_error_code(error::pass_through));
             return;
         }
-        
+
         if (m_alog->static_test(log::alevel::devel)) {
             m_alog->write(log::alevel::devel,
                 "Async connect to "+tcon->get_remote_endpoint()+" successful.");
         }
-        
+
         callback(tcon->get_handle(),lib::error_code());
     }
-    
+
     bool is_listening() const {
         return (m_state == LISTENING);
     }
-    
+
     /// Initialize a connection
     /**
-     * init is called by an endpoint once for each newly created connection. 
-     * It's purpose is to give the transport policy the chance to perform any 
-     * transport specific initialization that couldn't be done via the default 
+     * init is called by an endpoint once for each newly created connection.
+     * It's purpose is to give the transport policy the chance to perform any
+     * transport specific initialization that couldn't be done via the default
      * constructor.
      *
      * @param tcon A pointer to the transport portion of the connection.
@@ -627,14 +627,14 @@ protected:
         // Initialize the connection socket component
         socket_type::init(lib::static_pointer_cast<socket_con_type,
             transport_con_type>(tcon));
-        
+
         lib::error_code ec;
-        
+
         ec = tcon->init_asio(m_io_service);
         if (ec) {return ec;}
-        
+
         tcon->set_tcp_init_handler(m_tcp_init_handler);
-        
+
         return lib::error_code();
     }
 private:
@@ -645,13 +645,13 @@ private:
         s << msg << " error: " << ec << " (" << ec.message() << ")";
         m_elog->write(l,s.str());
     }
-    
+
     enum state {
         UNINITIALIZED = 0,
         READY = 1,
         LISTENING = 2
     };
-    
+
     // Handlers
     tcp_init_handler    m_tcp_init_handler;
 
@@ -660,7 +660,7 @@ private:
     bool                m_external_io_service;
     acceptor_ptr        m_acceptor;
     resolver_ptr        m_resolver;
-    
+
     elog_type* m_elog;
     alog_type* m_alog;
 
diff --git a/websocketpp/transport/asio/security/base.hpp b/websocketpp/transport/asio/security/base.hpp
index 073b825457..7e003794c6 100644
--- a/websocketpp/transport/asio/security/base.hpp
+++ b/websocketpp/transport/asio/security/base.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
@@ -76,21 +76,21 @@ namespace error {
         /// Catch-all error for security policy errors that don't fit in other
         /// categories
         security = 1,
-        
+
         /// Catch-all error for socket component errors that don't fit in other
         /// categories
         socket,
 
         /// A function was called in a state that it was illegal to do so.
         invalid_state,
-        
+
         /// The application was prompted to provide a TLS context and it was
         /// empty or otherwise invalid
         invalid_tls_context,
-        
+
         /// TLS Handshake Timeout
         tls_handshake_timeout,
-        
+
         /// pass_through from underlying library
         pass_through,
 
@@ -105,7 +105,7 @@ public:
     const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
         return "websocketpp.transport.asio.socket";
     }
-    
+
     std::string message(int value) const {
         switch(value) {
             case error::security:
diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp
index e31e2ea825..c0df412ffa 100644
--- a/websocketpp/transport/asio/security/none.hpp
+++ b/websocketpp/transport/asio/security/none.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
@@ -40,7 +40,7 @@ namespace transport {
 namespace asio {
 namespace basic_socket {
 
-typedef lib::function<void(connection_hdl,boost::asio::ip::tcp::socket&)> 
+typedef lib::function<void(connection_hdl,boost::asio::ip::tcp::socket&)>
     socket_init_handler;
 
 /// Basic Boost ASIO connection socket component
@@ -59,12 +59,12 @@ public:
     typedef boost::asio::io_service* io_service_ptr;
     /// Type of a shared pointer to the socket being used.
     typedef lib::shared_ptr<boost::asio::ip::tcp::socket> socket_ptr;
-    
+
     explicit connection() : m_state(UNINITIALIZED) {
-        //std::cout << "transport::asio::basic_socket::connection constructor" 
-        //          << std::endl; 
+        //std::cout << "transport::asio::basic_socket::connection constructor"
+        //          << std::endl;
     }
-    
+
     /// Check whether or not this connection is secure
     /**
      * @return Whether or not this connection is secure
@@ -72,7 +72,7 @@ public:
     bool is_secure() const {
         return false;
     }
-    
+
     /// Set the socket initialization handler
     /**
      * The socket initialization handler is called after the socket object is
@@ -92,7 +92,7 @@ public:
     boost::asio::ip::tcp::socket& get_socket() {
         return *m_socket;
     }
-    
+
     /// Retrieve a pointer to the underlying socket
     /**
      * This is used internally.
@@ -100,7 +100,7 @@ public:
     boost::asio::ip::tcp::socket& get_next_layer() {
         return *m_socket;
     }
-    
+
     /// Retrieve a pointer to the underlying socket
     /**
      * This is used internally. It can also be used to set socket options, etc
@@ -108,11 +108,11 @@ public:
     boost::asio::ip::tcp::socket& get_raw_socket() {
         return *m_socket;
     }
-    
+
     /// Get the remote endpoint address
     /**
-     * The iostream transport has no information about the ultimate remote 
-     * endpoint. It will return the string "iostream transport". To indicate 
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
      * this.
      *
      * TODO: allow user settable remote endpoint addresses if this seems useful
@@ -121,13 +121,13 @@ public:
      */
     std::string get_remote_endpoint(lib::error_code &ec) const {
         std::stringstream s;
-        
+
         boost::system::error_code bec;
         boost::asio::ip::tcp::endpoint ep = m_socket->remote_endpoint(bec);
-        
+
         if (bec) {
             ec = error::make_error_code(error::pass_through);
-            s << "Error getting remote endpoint: " << bec 
+            s << "Error getting remote endpoint: " << bec
                << " (" << bec.message() << ")";
             return s.str();
         } else {
@@ -150,21 +150,21 @@ protected:
         if (m_state != UNINITIALIZED) {
             return socket::make_error_code(socket::error::invalid_state);
         }
-        
+
         m_socket.reset(new boost::asio::ip::tcp::socket(*service));
-        
+
         m_state = READY;
-        
+
         return lib::error_code();
     }
-    
+
     /// Pre-initialize security policy
     /**
      * Called by the transport after a new connection is created to initialize
-     * the socket component of the connection. This method is not allowed to 
-     * write any bytes to the wire. This initialization happens before any 
+     * the socket component of the connection. This method is not allowed to
+     * write any bytes to the wire. This initialization happens before any
      * proxies or other intermediate wrappers are negotiated.
-     * 
+     *
      * @param callback Handler to call back with completion information
      */
     void pre_init(init_handler callback) {
@@ -172,31 +172,31 @@ protected:
             callback(socket::make_error_code(socket::error::invalid_state));
             return;
         }
-        
+
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl,*m_socket);
         }
-        
+
         m_state = READING;
-        
+
         callback(lib::error_code());
     }
-    
+
     /// Post-initialize security policy
     /**
-     * Called by the transport after all intermediate proxies have been 
+     * Called by the transport after all intermediate proxies have been
      * negotiated. This gives the security policy the chance to talk with the
      * real remote endpoint for a bit before the websocket handshake.
-     * 
+     *
      * @param callback Handler to call back with completion information
      */
     void post_init(init_handler callback) {
         callback(lib::error_code());
     }
-    
+
     /// Sets the connection handle
     /**
-     * The connection handle is passed to any handlers to identify the 
+     * The connection handle is passed to any handlers to identify the
      * connection
      *
      * @param hdl The new handle
@@ -204,18 +204,18 @@ protected:
     void set_handle(connection_hdl hdl) {
         m_hdl = hdl;
     }
-    
+
     /// Cancel all async operations on this socket
     void cancel_socket() {
         m_socket->cancel();
     }
-    
+
     void async_shutdown(socket_shutdown_handler h) {
         boost::system::error_code ec;
         m_socket->shutdown(boost::asio::ip::tcp::socket::shutdown_both,ec);
         h(ec);
     }
-    
+
     lib::error_code get_ec() const {
         return lib::error_code();
     }
@@ -225,10 +225,10 @@ private:
         READY = 1,
         READING = 2
     };
-    
+
     socket_ptr          m_socket;
     state               m_state;
-        
+
     connection_hdl      m_hdl;
     socket_init_handler m_socket_init_handler;
 };
@@ -242,13 +242,13 @@ class endpoint {
 public:
     /// The type of this endpoint socket component
     typedef endpoint type;
-    
+
     /// The type of the corresponding connection socket component
     typedef connection socket_con_type;
     /// The type of a shared pointer to the corresponding connection socket
     /// component.
     typedef socket_con_type::ptr socket_con_ptr;
-    
+
     explicit endpoint() {}
 
     /// Checks whether the endpoint creates secure connections
@@ -262,7 +262,7 @@ public:
     /// Set socket init handler
     /**
      * The socket init handler is called after a connection's socket is created
-     * but before it is used. This gives the end application an opportunity to 
+     * but before it is used. This gives the end application an opportunity to
      * set asio socket specific parameters.
      *
      * @param h The new socket_init_handler
@@ -275,7 +275,7 @@ protected:
     /**
      * Called by the transport after a new connection is created to initialize
      * the socket component of the connection.
-     * 
+     *
      * @param scon Pointer to the socket component of the connection
      *
      * @return Error code (empty on success)
diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
index bdfe7b2d81..a99275ddf5 100644
--- a/websocketpp/transport/asio/security/tls.hpp
+++ b/websocketpp/transport/asio/security/tls.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
@@ -61,7 +61,7 @@ public:
     typedef connection type;
     /// Type of a shared pointer to this connection socket component
     typedef lib::shared_ptr<type> ptr;
-    
+
     /// Type of the ASIO socket being used
     typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> socket_type;
     /// Type of a shared pointer to the ASIO socket being used
@@ -70,14 +70,14 @@ public:
     typedef boost::asio::io_service* io_service_ptr;
     /// Type of a shared pointer to the ASIO TLS context being used
     typedef lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-    
+
     typedef boost::system::error_code boost_error;
-    
+
     explicit connection() {
-        //std::cout << "transport::asio::tls_socket::connection constructor" 
-        //          << std::endl; 
+        //std::cout << "transport::asio::tls_socket::connection constructor"
+        //          << std::endl;
     }
-    
+
     /// Check whether or not this connection is secure
     /**
      * @return Whether or not this connection is secure
@@ -85,7 +85,7 @@ public:
     bool is_secure() const {
         return true;
     }
-    
+
     /// Retrieve a pointer to the underlying socket
     /**
      * This is used internally. It can also be used to set socket options, etc
@@ -93,7 +93,7 @@ public:
     socket_type::lowest_layer_type& get_raw_socket() {
         return m_socket->lowest_layer();
     }
-    
+
     /// Retrieve a pointer to the layer below the ssl stream
     /**
      * This is used internally.
@@ -101,7 +101,7 @@ public:
     socket_type::next_layer_type& get_next_layer() {
         return m_socket->next_layer();
     }
-    
+
     /// Retrieve a pointer to the wrapped socket
     /**
      * This is used internally.
@@ -126,7 +126,7 @@ public:
     /**
      * The tls init handler is called when needed to request a TLS context for
      * the library to use. A TLS init handler must be set and it must return a
-     * valid TLS context in order for this endpoint to be able to initialize 
+     * valid TLS context in order for this endpoint to be able to initialize
      * TLS connections
      *
      * @param h The new tls_init_handler
@@ -134,11 +134,11 @@ public:
     void set_tls_init_handler(tls_init_handler h) {
         m_tls_init_handler = h;
     }
-    
+
     /// Get the remote endpoint address
     /**
-     * The iostream transport has no information about the ultimate remote 
-     * endpoint. It will return the string "iostream transport". To indicate 
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
      * this.
      *
      * TODO: allow user settable remote endpoint addresses if this seems useful
@@ -147,13 +147,13 @@ public:
      */
     std::string get_remote_endpoint(lib::error_code &ec) const {
         std::stringstream s;
-        
+
         boost::system::error_code bec;
         boost::asio::ip::tcp::endpoint ep = m_socket->lowest_layer().remote_endpoint(bec);
-        
+
         if (bec) {
             ec = error::make_error_code(error::pass_through);
-            s << "Error getting remote endpoint: " << bec 
+            s << "Error getting remote endpoint: " << bec
                << " (" << bec.message() << ")";
             return s.str();
         } else {
@@ -176,46 +176,46 @@ protected:
             return socket::make_error_code(socket::error::missing_tls_init_handler);
         }
         m_context = m_tls_init_handler(m_hdl);
-        
+
         if (!m_context) {
             return socket::make_error_code(socket::error::invalid_tls_context);
         }
         m_socket.reset(new socket_type(*service,*m_context));
-        
+
         m_io_service = service;
         m_is_server = is_server;
-        
+
         return lib::error_code();
     }
-    
+
     /// Pre-initialize security policy
     /**
      * Called by the transport after a new connection is created to initialize
-     * the socket component of the connection. This method is not allowed to 
-     * write any bytes to the wire. This initialization happens before any 
+     * the socket component of the connection. This method is not allowed to
+     * write any bytes to the wire. This initialization happens before any
      * proxies or other intermediate wrappers are negotiated.
-     * 
+     *
      * @param callback Handler to call back with completion information
      */
     void pre_init(init_handler callback) {
         if (m_socket_init_handler) {
             m_socket_init_handler(m_hdl,get_socket());
         }
-        
+
         callback(lib::error_code());
     }
-    
+
     /// Post-initialize security policy
     /**
-     * Called by the transport after all intermediate proxies have been 
+     * Called by the transport after all intermediate proxies have been
      * negotiated. This gives the security policy the chance to talk with the
      * real remote endpoint for a bit before the websocket handshake.
-     * 
+     *
      * @param callback Handler to call back with completion information
      */
     void post_init(init_handler callback) {
         m_ec = socket::make_error_code(socket::error::tls_handshake_timeout);
-        
+
         // TLS handshake
         m_socket->async_handshake(
             get_handshake_type(),
@@ -227,10 +227,10 @@ protected:
             )
         );
     }
-    
+
     /// Sets the connection handle
     /**
-     * The connection handle is passed to any handlers to identify the 
+     * The connection handle is passed to any handlers to identify the
      * connection
      *
      * @param hdl The new handle
@@ -238,8 +238,8 @@ protected:
     void set_handle(connection_hdl hdl) {
         m_hdl = hdl;
     }
-    
-    void handle_init(init_handler callback, const 
+
+    void handle_init(init_handler callback, const
         boost::system::error_code& ec)
     {
         if (ec) {
@@ -247,19 +247,19 @@ protected:
         } else {
             m_ec = lib::error_code();
         }
-        
+
         callback(m_ec);
     }
-    
+
     lib::error_code get_ec() const {
         return m_ec;
     }
-    
+
     /// Cancel all async operations on this socket
     void cancel_socket() {
         get_raw_socket().cancel();
     }
-    
+
     void async_shutdown(socket_shutdown_handler callback) {
         m_socket->async_shutdown(callback);
     }
@@ -271,14 +271,14 @@ private:
             return boost::asio::ssl::stream_base::client;
         }
     }
-    
+
     io_service_ptr      m_io_service;
     context_ptr         m_context;
     socket_ptr          m_socket;
     bool                m_is_server;
-    
+
     lib::error_code     m_ec;
-    
+
     connection_hdl      m_hdl;
     socket_init_handler m_socket_init_handler;
     tls_init_handler    m_tls_init_handler;
@@ -313,7 +313,7 @@ public:
     /// Set socket init handler
     /**
      * The socket init handler is called after a connection's socket is created
-     * but before it is used. This gives the end application an opportunity to 
+     * but before it is used. This gives the end application an opportunity to
      * set asio socket specific parameters.
      *
      * @param h The new socket_init_handler
@@ -321,12 +321,12 @@ public:
     void set_socket_init_handler(socket_init_handler h) {
         m_socket_init_handler = h;
     }
-    
+
     /// Set TLS init handler
     /**
      * The tls init handler is called when needed to request a TLS context for
      * the library to use. A TLS init handler must be set and it must return a
-     * valid TLS context in order for this endpoint to be able to initialize 
+     * valid TLS context in order for this endpoint to be able to initialize
      * TLS connections
      *
      * @param h The new tls_init_handler
@@ -339,7 +339,7 @@ protected:
     /**
      * Called by the transport after a new connection is created to initialize
      * the socket component of the connection.
-     * 
+     *
      * @param scon Pointer to the socket component of the connection
      *
      * @return Error code (empty on success)
diff --git a/websocketpp/transport/base/connection.hpp b/websocketpp/transport/base/connection.hpp
index 5aa37cf7aa..cbc52a0419 100644
--- a/websocketpp/transport/base/connection.hpp
+++ b/websocketpp/transport/base/connection.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
@@ -38,27 +38,27 @@ namespace websocketpp {
 /// Transport policies provide network connectivity and timers
 /**
  * ### Connection Interface
- * 
+ *
  * Transport connection components needs to provide:
  *
- * *Warning: This documentation section and the transport connection interface 
+ * *Warning: This documentation section and the transport connection interface
  * are not complete.*
  *
  * **async_read_at_least**\n
- * `void async_read_at_least(size_t num_bytes, char *buf, size_t len, 
+ * `void async_read_at_least(size_t num_bytes, char *buf, size_t len,
  * read_handler handler)`\n
- * start an async read for at least num_bytes and at most len 
- * bytes into buf. Call handler when done with number of bytes read. 
- *   
- * WebSocket++ promises to have only one async_read_at_least in flight at a 
+ * start an async read for at least num_bytes and at most len
+ * bytes into buf. Call handler when done with number of bytes read.
+ *
+ * WebSocket++ promises to have only one async_read_at_least in flight at a
  * time. The transport must promise to only call read_handler once per async
  * read
  *
  * **async_write**\n
  * `void async_write(const char* buf, size_t len, write_handler handler)`\n
  * `void async_write(std::vector<buffer> & bufs, write_handler handler)`\n
- * Start a write of all of the data in buf or bufs. In second case data is 
- * written sequentially and in place without copying anything to a temporary 
+ * Start a write of all of the data in buf or bufs. In second case data is
+ * written sequentially and in place without copying anything to a temporary
  * location.
  *
  * Websocket++ promises to have only one async_write in flight at a time.
@@ -113,28 +113,28 @@ enum value {
     /// Catch-all error for transport policy errors that don't fit in other
     /// categories
     general = 1,
-    
+
     /// underlying transport pass through
     pass_through,
-    
+
     /// async_read_at_least call requested more bytes than buffer can store
     invalid_num_bytes,
-    
+
     /// async_read called while another async_read was in progress
     double_read,
 
     /// Operation aborted
     operation_aborted,
-    
+
     /// Operation not supported
     operation_not_supported,
-    
+
     /// End of file
     eof,
-    
+
     /// TLS short read
     tls_short_read,
-    
+
     /// Timer expired
     timeout
 };
@@ -146,7 +146,7 @@ class category : public lib::error_category {
     char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
         return "websocketpp.transport";
     }
-    
+
     std::string message(int value) const {
         switch(value) {
             case general:
diff --git a/websocketpp/transport/base/endpoint.hpp b/websocketpp/transport/base/endpoint.hpp
index d9a78564d1..118c85d00c 100644
--- a/websocketpp/transport/base/endpoint.hpp
+++ b/websocketpp/transport/base/endpoint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_BASE_HPP
@@ -45,19 +45,19 @@ namespace websocketpp {
  *
  * **init**\n
  * `lib::error_code init(transport_con_ptr tcon)`\n
- * init is called by an endpoint once for each newly created connection. 
- * It's purpose is to give the transport policy the chance to perform any 
- * transport specific initialization that couldn't be done via the default 
+ * init is called by an endpoint once for each newly created connection.
+ * It's purpose is to give the transport policy the chance to perform any
+ * transport specific initialization that couldn't be done via the default
  * constructor.
  */
 namespace transport {
 
 /// The type and signature of the callback passed to the accept method
-typedef lib::function<void(connection_hdl, lib::error_code const &)> 
+typedef lib::function<void(connection_hdl, lib::error_code const &)>
     accept_handler;
 
 /// The type and signature of the callback passed to the connect method
-typedef lib::function<void(connection_hdl, lib::error_code const &)> 
+typedef lib::function<void(connection_hdl, lib::error_code const &)>
     connect_handler;
 
 } // namespace transport
diff --git a/websocketpp/transport/iostream/base.hpp b/websocketpp/transport/iostream/base.hpp
index 1fc5d9cb19..5bfb5539d3 100644
--- a/websocketpp/transport/iostream/base.hpp
+++ b/websocketpp/transport/iostream/base.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
@@ -44,10 +44,10 @@ enum value {
     /// Catch-all error for transport policy errors that don't fit in other
     /// categories
     general = 1,
-    
+
     /// async_read_at_least call requested more bytes than buffer can store
     invalid_num_bytes,
-    
+
     /// async_read called while another async_read was in progress
     double_read,
 
@@ -67,7 +67,7 @@ class category : public lib::error_category {
     char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
         return "websocketpp.transport.iostream";
     }
-    
+
     std::string message(int value) const {
         switch(value) {
             case general:
diff --git a/websocketpp/transport/iostream/connection.hpp b/websocketpp/transport/iostream/connection.hpp
index aea5202d31..69faf49eb5 100644
--- a/websocketpp/transport/iostream/connection.hpp
+++ b/websocketpp/transport/iostream/connection.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
@@ -42,7 +42,7 @@ namespace websocketpp {
 namespace transport {
 namespace iostream {
 
-/// Empty timer class to stub out for timer functionality that iostream 
+/// Empty timer class to stub out for timer functionality that iostream
 /// transport doesn't support
 struct timer {
     void cancel() {}
@@ -55,7 +55,7 @@ public:
     typedef connection<config> type;
     /// Type of a shared pointer to this connection transport component
     typedef lib::shared_ptr<type> ptr;
-    
+
     /// transport concurrency policy
     typedef typename config::concurrency_type concurrency_type;
     /// Type of this transport's access logging policy
@@ -66,9 +66,9 @@ public:
     // Concurrency policy types
     typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
     typedef typename concurrency_type::mutex_type mutex_type;
-    
+
     typedef lib::shared_ptr<timer> timer_ptr;
-    
+
     explicit connection(bool is_server, alog_type& alog, elog_type& elog)
       : m_output_stream(NULL)
       , m_reading(false)
@@ -78,12 +78,12 @@ public:
     {
         m_alog.write(log::alevel::devel,"iostream con transport constructor");
     }
-    
+
     /// Register a std::ostream with the transport for writing output
     /**
      * Register a std::ostream with the transport. All future writes will be
      * done to this output stream.
-     * 
+     *
      * @param o A pointer to the ostream to use for output.
      */
     void register_ostream(std::ostream* o) {
@@ -91,7 +91,7 @@ public:
         scoped_lock_type lock(m_read_mutex);
         m_output_stream = o;
     }
-    
+
     /// Overloaded stream input operator
     /**
      * Attempts to read input from the given stream into the transport. Bytes
@@ -99,12 +99,12 @@ public:
      * Input in this manner will only read until the current read buffer has
      * been filled. Then it will signal the library to process the input. If the
      * library's input handler adds a new async_read, additional bytes will be
-     * read, otherwise the input operation will end. 
-     * 
+     * read, otherwise the input operation will end.
+     *
      * When this function returns one of the following conditions is true:
      * - There is no outstanding read operation
      * - There are no more bytes available in the input stream
-     * 
+     *
      * You can use tellg() on the input stream to determine if all of the input
      * bytes were read or not.
      *
@@ -114,32 +114,32 @@ public:
     friend std::istream& operator>> (std::istream &in, type &t) {
         // this serializes calls to external read.
         scoped_lock_type lock(t.m_read_mutex);
-        
+
         t.read(in);
-        
+
         return in;
     }
-    
+
     /// Manual input supply
     /**
-     * Copies bytes from buf into WebSocket++'s input buffers. Bytes will be 
+     * Copies bytes from buf into WebSocket++'s input buffers. Bytes will be
      * copied from the supplied buffer to fulfill any pending library reads. It
-     * will return the number of bytes successfully processed. If there are no 
+     * will return the number of bytes successfully processed. If there are no
      * pending reads readsome will return immediately. Not all of the bytes may
      * be able to be read in one call
      */
     size_t readsome(const char *buf, size_t len) {
         // this serializes calls to external read.
         scoped_lock_type lock(m_read_mutex);
-        
+
         return this->readsome_impl(buf,len);
     }
-    
-    
+
+
     /// Tests whether or not the underlying transport is secure
     /**
      * iostream transport will return false always because it has no information
-     * about the ultimate remote endpoint. This may or may not be accurate 
+     * about the ultimate remote endpoint. This may or may not be accurate
      * depending on the real source of bytes being input.
      *
      * TODO: allow user settable is_secure flag if this seems useful
@@ -149,11 +149,11 @@ public:
     bool is_secure() const {
         return false;
     }
-    
+
     /// Get the remote endpoint address
     /**
-     * The iostream transport has no information about the ultimate remote 
-     * endpoint. It will return the string "iostream transport". To indicate 
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
      * this.
      *
      * TODO: allow user settable remote endpoint addresses if this seems useful
@@ -163,17 +163,17 @@ public:
     std::string get_remote_endpoint() const {
         return "iostream transport";
     }
-    
+
     /// Get the connection handle
     connection_hdl get_handle() const {
         return m_connection_hdl;
     }
-    
+
     /// Call back a function after a period of time.
     /**
-     * Timers are not implemented in this transport. The timer pointer will 
+     * Timers are not implemented in this transport. The timer pointer will
      * always be empty. The handler will never be called.
-     * 
+     *
      * @param duration Length of time to wait in milliseconds
      *
      * @param callback The function to call back when the timer has expired
@@ -189,7 +189,7 @@ protected:
         m_alog.write(log::alevel::devel,"iostream connection init");
         callback(lib::error_code());
     }
-    
+
     /// Initiate an async_read for at least num_bytes bytes into buf
     /**
      * Initiates an async_read request for at least num_bytes bytes. The input
@@ -201,12 +201,12 @@ protected:
      * application should be prepared to accept either.
      *
      * The application should never call this method a second time before it has
-     * been called back for the first read. If this is done, the second read 
+     * been called back for the first read. If this is done, the second read
      * will be called back immediately with a double_read error.
      *
-     * If num_bytes or len are zero handler will be called back immediately 
+     * If num_bytes or len are zero handler will be called back immediately
      * indicating success.
-     * 
+     *
      * @param num_bytes Don't call handler until at least this many bytes have
      * been read.
      *
@@ -217,28 +217,28 @@ protected:
      * @param handler The callback to invoke when the operation is complete or
      * ends in an error
      */
-    void async_read_at_least(size_t num_bytes, char *buf, size_t len, 
+    void async_read_at_least(size_t num_bytes, char *buf, size_t len,
         read_handler handler)
     {
         std::stringstream s;
         s << "iostream_con async_read_at_least: " << num_bytes;
         m_alog.write(log::alevel::devel,s.str());
-        
+
         if (num_bytes > len) {
             handler(make_error_code(error::invalid_num_bytes),size_t(0));
             return;
         }
-        
+
         if (m_reading == true) {
             handler(make_error_code(error::double_read),size_t(0));
             return;
         }
-        
+
         if (num_bytes == 0 || len == 0) {
             handler(lib::error_code(),size_t(0));
             return;
         }
-        
+
         m_buf = buf;
         m_len = len;
         m_bytes_needed = num_bytes;
@@ -246,13 +246,13 @@ protected:
         m_cursor = 0;
         m_reading = true;
     }
-    
+
     /// Asyncronous Transport Write
     /**
-     * Write len bytes in buf to the output stream. Call handler to report 
+     * Write len bytes in buf to the output stream. Call handler to report
      * success or failure. handler may or may not be called during async_write,
      * but it must be safe for this to happen.
-     * 
+     *
      * Will return 0 on success. Other possible errors (not exhaustive)
      * output_stream_required: No output stream was registered to write to
      * bad_stream: a ostream pass through error
@@ -264,27 +264,27 @@ protected:
     void async_write(const char* buf, size_t len, write_handler handler) {
         m_alog.write(log::alevel::devel,"iostream_con async_write");
         // TODO: lock transport state?
-        
+
         if (!m_output_stream) {
             handler(make_error_code(error::output_stream_required));
             return;
         }
-        
+
         m_output_stream->write(buf,len);
-        
+
         if (m_output_stream->bad()) {
             handler(make_error_code(error::bad_stream));
         } else {
             handler(lib::error_code());
         }
     }
-    
+
     /// Asyncronous Transport Write (scatter-gather)
     /**
-     * Write a sequence of buffers to the output stream. Call handler to report 
+     * Write a sequence of buffers to the output stream. Call handler to report
      * success or failure. handler may or may not be called during async_write,
      * but it must be safe for this to happen.
-     * 
+     *
      * Will return 0 on success. Other possible errors (not exhaustive)
      * output_stream_required: No output stream was registered to write to
      * bad_stream: a ostream pass through error
@@ -295,21 +295,21 @@ protected:
     void async_write(const std::vector<buffer>& bufs, write_handler handler) {
         m_alog.write(log::alevel::devel,"iostream_con async_write buffer list");
         // TODO: lock transport state?
-        
+
         if (!m_output_stream) {
             handler(make_error_code(error::output_stream_required));
             return;
         }
-        
+
         std::vector<buffer>::const_iterator it;
         for (it = bufs.begin(); it != bufs.end(); it++) {
             m_output_stream->write((*it).buf,(*it).len);
-            
+
             if (m_output_stream->bad()) {
                 handler(make_error_code(error::bad_stream));
             }
         }
-        
+
         handler(lib::error_code());
     }
 
@@ -320,20 +320,20 @@ protected:
     void set_handle(connection_hdl hdl) {
         m_connection_hdl = hdl;
     }
-    
+
     /// Call given handler back within the transport's event system (if present)
     /**
      * Invoke a callback within the transport's event system if it has one. If
      * it doesn't, the handler will be invoked immediately before this function
      * returns.
-     * 
+     *
      * @param handler The callback to invoke
-     * 
+     *
      * @return Whether or not the transport was able to register the handler for
      * callback.
      */
     lib::error_code dispatch(dispatch_handler handler) {
-        handler(); 
+        handler();
         return lib::error_code();
     }
 
@@ -343,76 +343,76 @@ protected:
 private:
     void read(std::istream &in) {
         m_alog.write(log::alevel::devel,"iostream_con read");
-        
-        while (in.good()) {  
+
+        while (in.good()) {
             if (!m_reading) {
                 m_elog.write(log::elevel::devel,"write while not reading");
                 break;
             }
-            
+
             in.read(m_buf+m_cursor,static_cast<std::streamsize>(m_len-m_cursor));
-            
+
             if (in.gcount() == 0) {
                 m_elog.write(log::elevel::devel,"read zero bytes");
                 break;
             }
-            
+
             m_cursor += static_cast<size_t>(in.gcount());
-            
+
             // TODO: error handling
             if (in.bad()) {
                 m_reading = false;
                 m_read_handler(make_error_code(error::bad_stream), m_cursor);
             }
-            
+
             if (m_cursor >= m_bytes_needed) {
                 m_reading = false;
                 m_read_handler(lib::error_code(), m_cursor);
             }
         }
     }
-    
+
     size_t readsome_impl(const char * buf, size_t len) {
         m_alog.write(log::alevel::devel,"iostream_con readsome");
-        
+
         if (!m_reading) {
             m_elog.write(log::elevel::devel,"write while not reading");
             return 0;
         }
-        
+
         size_t bytes_to_copy = std::min(len,m_len-m_cursor);
-        
+
         std::copy(buf,buf+bytes_to_copy,m_buf);
-        
+
         m_cursor += bytes_to_copy;
-        
+
         if (m_cursor >= m_bytes_needed) {
             m_reading = false;
             m_read_handler(lib::error_code(), m_cursor);
         }
-        
+
         return bytes_to_copy;
     }
-    
+
     // Read space (Protected by m_read_mutex)
     char*           m_buf;
     size_t          m_len;
     size_t          m_bytes_needed;
     read_handler    m_read_handler;
     size_t          m_cursor;
-    
+
     // transport resources
     std::ostream*   m_output_stream;
     connection_hdl  m_connection_hdl;
-    
+
     bool            m_reading;
     const bool      m_is_server;
     alog_type& m_alog;
     elog_type& m_elog;
 
-    // This lock ensures that only one thread can edit read data for this 
-    // connection. This is a very coarse lock that is basically locked all the 
-    // time. The nature of the connection is such that it cannot be 
+    // This lock ensures that only one thread can edit read data for this
+    // connection. This is a very coarse lock that is basically locked all the
+    // time. The nature of the connection is such that it cannot be
     // parallelized, the locking is here to prevent intra-connection concurrency
     // in order to allow inter-connection concurrency.
     mutex_type      m_read_mutex;
diff --git a/websocketpp/transport/iostream/endpoint.hpp b/websocketpp/transport/iostream/endpoint.hpp
index da9e6153e7..5784256997 100644
--- a/websocketpp/transport/iostream/endpoint.hpp
+++ b/websocketpp/transport/iostream/endpoint.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
@@ -47,7 +47,7 @@ public:
     typedef endpoint type;
     /// Type of a pointer to this endpoint transport component
     typedef lib::shared_ptr<type> ptr;
-    
+
     /// Type of this endpoint's concurrency policy
     typedef typename config::concurrency_type concurrency_type;
     /// Type of this endpoint's error logging policy
@@ -58,25 +58,25 @@ public:
     /// Type of this endpoint transport component's associated connection
     /// transport component.
     typedef iostream::connection<config> transport_con_type;
-    /// Type of a shared pointer to this endpoint transport component's 
+    /// Type of a shared pointer to this endpoint transport component's
     /// associated connection transport component
     typedef typename transport_con_type::ptr transport_con_ptr;
-    
+
     // generate and manage our own io_service
     explicit endpoint() : m_output_stream(NULL)
     {
-        //std::cout << "transport::iostream::endpoint constructor" << std::endl; 
+        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
     }
-    
+
     void register_ostream(std::ostream* o) {
         m_alog->write(log::alevel::devel,"register_ostream");
         m_output_stream = o;
     }
-    
+
     /// Tests whether or not the underlying transport is secure
     /**
      * iostream transport will return false always because it has no information
-     * about the ultimate remote endpoint. This may or may not be accurate 
+     * about the ultimate remote endpoint. This may or may not be accurate
      * depending on the real source of bytes being input.
      *
      * TODO: allow user settable is_secure flag if this seems useful
@@ -89,30 +89,30 @@ public:
 protected:
     /// Initialize logging
     /**
-     * The loggers are located in the main endpoint class. As such, the 
+     * The loggers are located in the main endpoint class. As such, the
      * transport doesn't have direct access to them. This method is called
      * by the endpoint constructor to allow shared logging from the transport
      * component. These are raw pointers to member variables of the endpoint.
      * In particular, they cannot be used in the transport constructor as they
-     * haven't been constructed yet, and cannot be used in the transport 
+     * haven't been constructed yet, and cannot be used in the transport
      * destructor as they will have been destroyed by then.
      */
     void init_logging(alog_type* a, elog_type* e) {
         m_elog = e;
         m_alog = a;
     }
-    
+
     /// Initiate a new connection
     void async_connect(transport_con_ptr tcon, uri_ptr u, connect_handler cb) {
         // Do we need to do anything here?
         cb(tcon->get_handle(),lib::error_code());
     }
-    
+
     /// Initialize a connection
     /**
-     * Init is called by an endpoint once for each newly created connection. 
-     * It's purpose is to give the transport policy the chance to perform any 
-     * transport specific initialization that couldn't be done via the default 
+     * Init is called by an endpoint once for each newly created connection.
+     * It's purpose is to give the transport policy the chance to perform any
+     * transport specific initialization that couldn't be done via the default
      * constructor.
      *
      * @param tcon A pointer to the transport portion of the connection.
diff --git a/websocketpp/uri.hpp b/websocketpp/uri.hpp
index b0604d4760..005c67e75c 100644
--- a/websocketpp/uri.hpp
+++ b/websocketpp/uri.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_URI_HPP
@@ -40,9 +40,9 @@ namespace websocketpp {
 
 // TODO: figure out why this fixes horrible linking errors.
 
-/// Default port for ws:// 
+/// Default port for ws://
 static uint16_t const uri_default_port = 80;
-/// Default port for wss:// 
+/// Default port for wss://
 static uint16_t const uri_default_secure_port = 443;
 
 class uri {
@@ -50,11 +50,11 @@ public:
     explicit uri(std::string const & uri) : m_valid(false) {
         std::string::const_iterator it;
         std::string::const_iterator temp;
-        
+
         int state = 0;
 
         it = uri.begin();
-        
+
         if (std::equal(it,it+6,"wss://")) {
             m_secure = true;
             m_scheme = "wss";
@@ -74,7 +74,7 @@ public:
         } else {
             return;
         }
-        
+
         // extract host.
         // either a host string
         // an IPv4 address
@@ -83,10 +83,10 @@ public:
             ++it;
             // IPv6 literal
             // extract IPv6 digits until ]
-            
+
             // TODO: this doesn't work on g++... not sure why
             //temp = std::find(it,it2,']');
-            
+
             temp = it;
             while (temp != uri.end()) {
                 if (*temp == ']') {
@@ -161,8 +161,8 @@ public:
 
         m_valid = true;
     }
-    
-    uri(bool secure, std::string const & host, uint16_t port, 
+
+    uri(bool secure, std::string const & host, uint16_t port,
         std::string const & resource)
       : m_scheme(secure ? "wss" : "ws")
       , m_host(host)
@@ -170,7 +170,7 @@ public:
       , m_port(port)
       , m_secure(secure)
       , m_valid(true) {}
-    
+
     uri(bool secure, std::string const & host, std::string const & resource)
       : m_scheme(secure ? "wss" : "ws")
       , m_host(host)
@@ -178,8 +178,8 @@ public:
       , m_port(secure ? uri_default_secure_port : uri_default_port)
       , m_secure(secure)
       , m_valid(true) {}
-      
-    uri(bool secure, std::string const & host, std::string const & port, 
+
+    uri(bool secure, std::string const & host, std::string const & port,
         std::string const & resource)
       : m_scheme(secure ? "wss" : "ws")
       , m_host(host)
@@ -190,8 +190,8 @@ public:
         m_port = get_port_from_string(port,ec);
         m_valid = !ec;
     }
-    
-    uri(std::string const & scheme, std::string const & host, uint16_t port, 
+
+    uri(std::string const & scheme, std::string const & host, uint16_t port,
         std::string const & resource)
       : m_scheme(scheme)
       , m_host(host)
@@ -199,7 +199,7 @@ public:
       , m_port(port)
       , m_secure(scheme == "wss" || scheme == "https")
       , m_valid(true) {}
-    
+
     uri(std::string scheme, std::string const & host, std::string const & resource)
       : m_scheme(scheme)
       , m_host(host)
@@ -207,8 +207,8 @@ public:
       , m_port((scheme == "wss" || scheme == "https") ? uri_default_secure_port : uri_default_port)
       , m_secure(scheme == "wss" || scheme == "https")
       , m_valid(true) {}
-      
-    uri(std::string const & scheme, std::string const & host, 
+
+    uri(std::string const & scheme, std::string const & host,
         std::string const & port, std::string const & resource)
       : m_scheme(scheme)
       , m_host(host)
@@ -223,11 +223,11 @@ public:
     bool get_valid() const {
         return m_valid;
     }
-    
+
     bool get_secure() const {
         return m_secure;
     }
-    
+
     std::string const & get_scheme() const {
         return m_scheme;
     }
@@ -235,7 +235,7 @@ public:
     std::string const & get_host() const {
         return m_host;
     }
-    
+
     std::string get_host_port() const {
         if (m_port == (m_secure ? uri_default_secure_port : uri_default_port)) {
             return m_host;
@@ -245,60 +245,60 @@ public:
             return p.str();
         }
     }
-    
+
     std::string get_authority() const {
         std::stringstream p;
         p << m_host << ":" << m_port;
         return p.str();
     }
-    
+
     uint16_t get_port() const {
         return m_port;
     }
-    
+
     std::string get_port_str() const {
         std::stringstream p;
         p << m_port;
         return p.str();
     }
-    
+
     std::string const & get_resource() const {
         return m_resource;
     }
-    
+
     std::string str() const {
         std::stringstream s;
-    
+
         s << m_scheme << "://" << m_host;
-        
+
         if (m_port != (m_secure ? uri_default_secure_port : uri_default_port)) {
             s << ":" << m_port;
         }
-        
+
         s << m_resource;
         return s.str();
     }
-    
+
     // get query?
     // get fragment
-    
+
     // hi <3
-    
+
     // get the string representation of this URI
-    
+
     //std::string base() const; // is this still needed?
-    
+
     // setter methods set some or all (in the case of parse) based on the input.
     // These functions throw a uri_exception on failure.
     /*void set_uri(const std::string& uri);
-    
+
     void set_secure(bool secure);
     void set_host(const std::string& host);
     void set_port(uint16_t port);
     void set_port(const std::string& port);
     void set_resource(const std::string& resource);*/
 private:
-    uint16_t get_port_from_string(std::string const & port, lib::error_code & 
+    uint16_t get_port_from_string(std::string const & port, lib::error_code &
         ec) const
     {
         ec = lib::error_code();
@@ -306,20 +306,20 @@ private:
         if (port == "") {
             return (m_secure ? uri_default_secure_port : uri_default_port);
         }
-        
+
         unsigned int t_port = static_cast<unsigned int>(atoi(port.c_str()));
-                
+
         if (t_port > 65535) {
             ec = error::make_error_code(error::invalid_port);
         }
-        
+
         if (t_port == 0) {
             ec = error::make_error_code(error::invalid_port);
         }
-        
+
         return static_cast<uint16_t>(t_port);
     }
-    
+
     std::string m_scheme;
     std::string m_host;
     std::string m_resource;
diff --git a/websocketpp/utf8_validator.hpp b/websocketpp/utf8_validator.hpp
index 61ea988406..2187eff7d4 100644
--- a/websocketpp/utf8_validator.hpp
+++ b/websocketpp/utf8_validator.hpp
@@ -45,14 +45,14 @@ decode(uint32_t* state, uint32_t* codep, uint8_t byte) {
 class validator {
 public:
     validator() : m_state(UTF8_ACCEPT),m_codepoint(0) {}
-    
+
     bool consume (uint32_t byte) {
         if (utf8_validator::decode(&m_state,&m_codepoint,static_cast<uint8_t>(byte)) == UTF8_REJECT) {
             return false;
         }
         return true;
     }
-    
+
     template <typename iterator_type>
     bool decode (iterator_type b, iterator_type e) {
         for (iterator_type i = b; i != e; i++) {
@@ -62,11 +62,11 @@ public:
         }
         return true;
     }
-    
+
     bool complete() {
         return m_state == UTF8_ACCEPT;
     }
-    
+
     void reset() {
         m_state = UTF8_ACCEPT;
         m_codepoint = 0;
@@ -76,7 +76,7 @@ private:
     uint32_t    m_codepoint;
 };
 
-// convenience function that creates a validator, validates a complete string 
+// convenience function that creates a validator, validates a complete string
 // and returns the result.
 // TODO: should this be inline?
 inline bool validate(const std::string& s) {
@@ -86,7 +86,7 @@ inline bool validate(const std::string& s) {
     }
     return v.complete();
 }
-    
+
 } // namespace utf8_validator
 } // namespace websocketpp
 
diff --git a/websocketpp/utilities.hpp b/websocketpp/utilities.hpp
index 4472ddfe8c..d5ad902dd3 100644
--- a/websocketpp/utilities.hpp
+++ b/websocketpp/utilities.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_UTILITIES_HPP
@@ -38,7 +38,7 @@ namespace websocketpp {
 namespace utility {
 
 /// Helper functor for case insensitive find
-/** 
+/**
  * Based on code from
  * http://stackoverflow.com/questions/3152241/case-insensitive-stdstring-find
  *
@@ -51,7 +51,7 @@ struct my_equal {
      * @param [in] loc The locale to use for determining the case of values
      */
     my_equal(std::locale const & loc ) : m_loc(loc) {}
-    
+
     /// Perform a case insensitive comparison
     /**
      * @param ch1 The first value to compare
@@ -67,21 +67,21 @@ private:
 };
 
 /// Helper less than functor for case insensitive find
-/** 
+/**
  * Based on code from
  * http://stackoverflow.com/questions/3152241/case-insensitive-stdstring-find
  */
 struct ci_less : std::binary_function<std::string, std::string, bool> {
     // case-independent (ci) compare_less binary function
-    struct nocase_compare 
+    struct nocase_compare
       : public std::binary_function<unsigned char,unsigned char,bool>
     {
         bool operator() (unsigned char const & c1, unsigned char const & c2) const {
-            return std::tolower (c1) < std::tolower (c2); 
+            return std::tolower (c1) < std::tolower (c2);
         }
     };
     bool operator() (std::string const & s1, std::string const & s2) const {
-        return std::lexicographical_compare 
+        return std::lexicographical_compare
             (s1.begin (), s1.end (),   // source range
             s2.begin (), s2.end (),   // dest range
             nocase_compare ());  // comparison
@@ -92,40 +92,40 @@ struct ci_less : std::binary_function<std::string, std::string, bool> {
 /**
  * @param [in] haystack The string to search in
  * @param [in] needle The string to search for
- * @param [in] loc The locale to use for determining the case of values. 
+ * @param [in] loc The locale to use for determining the case of values.
  *             Defaults to the current locale.
  * @return An iterator to the first element of the first occurrance of needle in
- *         haystack. If the sequence is not found, the function returns 
+ *         haystack. If the sequence is not found, the function returns
  *         haystack.end()
  */
 template<typename T>
-typename T::const_iterator ci_find_substr(T const & haystack, T const & needle, 
+typename T::const_iterator ci_find_substr(T const & haystack, T const & needle,
     std::locale const & loc = std::locale())
 {
-    return std::search( haystack.begin(), haystack.end(), 
+    return std::search( haystack.begin(), haystack.end(),
         needle.begin(), needle.end(), my_equal<typename T::value_type>(loc) );
 }
 
 /// Find substring (case insensitive)
 /**
- * @todo Is this still used? This method may not make sense.. should use 
+ * @todo Is this still used? This method may not make sense.. should use
  * iterators or be less generic. As is it is too tightly coupled to std::string
  *
  * @param [in] haystack The string to search in
  * @param [in] needle The string to search for as a char array of values
  * @param [in] size Length of needle
- * @param [in] loc The locale to use for determining the case of values. 
+ * @param [in] loc The locale to use for determining the case of values.
  *             Defaults to the current locale.
  * @return An iterator to the first element of the first occurrance of needle in
- *         haystack. If the sequence is not found, the function returns 
+ *         haystack. If the sequence is not found, the function returns
  *         haystack.end()
  */
 template<typename T>
-typename T::const_iterator ci_find_substr(T const & haystack, 
-    typename T::value_type const * needle, typename T::size_type size, 
+typename T::const_iterator ci_find_substr(T const & haystack,
+    typename T::value_type const * needle, typename T::size_type size,
     std::locale const & loc = std::locale())
 {
-    return std::search( haystack.begin(), haystack.end(), 
+    return std::search( haystack.begin(), haystack.end(),
         needle, needle+size, my_equal<typename T::value_type>(loc) );
 }
 
@@ -141,7 +141,7 @@ std::string to_lower(std::string const & in);
  * @param [in] subject The string to search in
  * @param [in] search The string to search for
  * @param [in] replace The string to replace with
- * @return A copy of `subject` with all occurances of `search` replaced with 
+ * @return A copy of `subject` with all occurances of `search` replaced with
  *         `replace`
  */
 std::string string_replace_all(std::string subject, std::string const & search,
@@ -150,7 +150,7 @@ std::string string_replace_all(std::string subject, std::string const & search,
 /// Convert std::string to ascii printed string of hex digits
 /**
  * @param [in] input The string to print
- * @return A copy of `input` converted to the printable representation of the 
+ * @return A copy of `input` converted to the printable representation of the
  *         hex values of its data.
  */
 std::string to_hex(std::string const & input);
@@ -159,7 +159,7 @@ std::string to_hex(std::string const & input);
 /**
  * @param [in] input The byte array to print
  * @param [in] length The length of input
- * @return A copy of `input` converted to the printable representation of the 
+ * @return A copy of `input` converted to the printable representation of the
  *         hex values of its data.
  */
 std::string to_hex(uint8_t const * input, size_t length);
@@ -168,7 +168,7 @@ std::string to_hex(uint8_t const * input, size_t length);
 /**
  * @param [in] input The char array to print
  * @param [in] length The length of input
- * @return A copy of `input` converted to the printable representation of the 
+ * @return A copy of `input` converted to the printable representation of the
  *         hex values of its data.
  */
 std::string to_hex(char const * input, size_t length);
diff --git a/websocketpp/version.hpp b/websocketpp/version.hpp
index dd810b36bb..6c77010b55 100644
--- a/websocketpp/version.hpp
+++ b/websocketpp/version.hpp
@@ -11,10 +11,10 @@
  *     * Neither the name of the WebSocket++ Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -22,7 +22,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 #ifndef WEBSOCKETPP_VERSION_HPP
@@ -47,7 +47,7 @@ static int const minor_version = 3;
 static int const patch_version = 0;
 /// Library pre-release flag
 /**
- * This is a textual flag indicating the type and number for pre-release 
+ * This is a textual flag indicating the type and number for pre-release
  * versions (dev, alpha, beta, rc). This will be blank for release versions.
  */
 static char const prerelease_flag[] = "alpha3";
@@ -57,4 +57,4 @@ static char const user_agent[] = "WebSocket++/0.3.0-alpha3";
 
 } // namespace websocketpp
 
-#endif // WEBSOCKETPP_VERSION_HPP
\ No newline at end of file
+#endif // WEBSOCKETPP_VERSION_HPP