From 1ddd43ccb03394c28429930a1dd771d75a056f2d Mon Sep 17 00:00:00 2001
From: Peter Thorson <github@zaphoyd.com>
Date: Sat, 30 Mar 2013 07:05:31 -0500
Subject: [PATCH] client get_connection now sets URI

---
 test/roles/client.cpp                 | 10 +++++++---
 websocketpp/roles/client_endpoint.hpp |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/roles/client.cpp b/test/roles/client.cpp
index 369c7661d0..f32cd0a3f7 100644
--- a/test/roles/client.cpp
+++ b/test/roles/client.cpp
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE( invalid_uri ) {
     
     connection_ptr con = c.get_connection("foo", ec);
     
-    BOOST_CHECK( ec == websocketpp::error::make_error_code(websocketpp::error::invalid_uri) );
+    BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::invalid_uri) );
 }
 
 BOOST_AUTO_TEST_CASE( unsecure_endpoint ) {
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE( unsecure_endpoint ) {
     
     connection_ptr con = c.get_connection("wss://localhost/", ec);
     
-    BOOST_CHECK( ec == websocketpp::error::make_error_code(websocketpp::error::endpoint_not_secure) );
+    BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::endpoint_not_secure) );
 }
 
 BOOST_AUTO_TEST_CASE( get_connection ) {
@@ -81,4 +81,8 @@ BOOST_AUTO_TEST_CASE( get_connection ) {
     connection_ptr con = c.get_connection("ws://localhost/", ec);
     
     BOOST_CHECK( con );
-}
\ No newline at end of file
+    BOOST_CHECK_EQUAL( con->get_host() , "localhost" );
+    BOOST_CHECK_EQUAL( con->get_port() , 80 );
+    BOOST_CHECK_EQUAL( con->get_secure() , false );
+    BOOST_CHECK_EQUAL( con->get_resource() , "/" );
+}
diff --git a/websocketpp/roles/client_endpoint.hpp b/websocketpp/roles/client_endpoint.hpp
index 38abb429e5..79b5ffc717 100644
--- a/websocketpp/roles/client_endpoint.hpp
+++ b/websocketpp/roles/client_endpoint.hpp
@@ -98,6 +98,8 @@ public:
                 return con;
             }
             
+            con->set_uri(location);
+            
             // Success
             ec = lib::error_code();
             return con;