From 20ce498d2326e01a7a4f88191bd86db947ef34e8 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Tue, 17 Sep 2019 12:08:52 -0700
Subject: [PATCH] On error while doing a client handshake, additionally display
 port number next to the host name

---
 DOCKER_VERSION                       | 2 +-
 docs/CHANGELOG.md                    | 4 ++++
 ixwebsocket/IXWebSocketHandshake.cpp | 4 ++--
 ixwebsocket/IXWebSocketVersion.h     | 2 +-
 test/CMakeLists.txt                  | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/DOCKER_VERSION b/DOCKER_VERSION
index 6abaeb2f..024b066c 100644
--- a/DOCKER_VERSION
+++ b/DOCKER_VERSION
@@ -1 +1 @@
-6.2.0
+6.2.1
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 3bf2d151..ac81990e 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [6.2.1] - 2019-09-17
+
+- On error while doing a client handshake, additionally display port number next to the host name
+
 ## [6.2.0] - 2019-09-09
 
 - websocket and http server: server does not close the bound client socket in many cases
diff --git a/ixwebsocket/IXWebSocketHandshake.cpp b/ixwebsocket/IXWebSocketHandshake.cpp
index 2e03423c..b7f7f39b 100644
--- a/ixwebsocket/IXWebSocketHandshake.cpp
+++ b/ixwebsocket/IXWebSocketHandshake.cpp
@@ -173,7 +173,7 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Expecting HTTP/1.1, got " << httpVersion << ". "
-               << "Rejecting connection to " << host
+               << "Rejecting connection to " << host << ":" << port
                << ", status: " << status
                << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
@@ -183,7 +183,7 @@ namespace ix
         if (status != 101)
         {
             std::stringstream ss;
-            ss << "Got bad status connecting to " << host
+            ss << "Got bad status connecting to " << host << ":" << port
                << ", status: " << status
                << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index d82a51e3..adb7bc23 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "6.2.0"
+#define IX_WEBSOCKET_VERSION "6.2.1"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2654b850..fe223776 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
 )
 
 # Shared sources
-set (SOURCES 
+set (SOURCES
   test_runner.cpp
   IXTest.cpp
   IXGetFreePort.cpp