瀏覽代碼

Merge pull request #239 from paullouisageneau/fix-tls-host

Fix WebSocket explicit port with TLS
Paul-Louis Ageneau 4 年之前
父節點
當前提交
6e7c082a7c
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      src/websocket.cpp
  2. 1 1
      test/websocket.cpp

+ 3 - 3
src/websocket.cpp

@@ -251,12 +251,12 @@ shared_ptr<TlsTransport> WebSocket::initTlsTransport() {
 		if (!mConfig.disableTlsVerification) {
 			PLOG_WARNING << "TLS certificate verification with root CA is not supported on Windows";
 		}
-		transport = std::make_shared<TlsTransport>(lower, mHost, stateChangeCallback);
+		transport = std::make_shared<TlsTransport>(lower, mHostname, stateChangeCallback);
 #else
 		if (mConfig.disableTlsVerification)
-			transport = std::make_shared<TlsTransport>(lower, mHost, stateChangeCallback);
+			transport = std::make_shared<TlsTransport>(lower, mHostname, stateChangeCallback);
 		else
-			transport = std::make_shared<VerifiedTlsTransport>(lower, mHost, stateChangeCallback);
+			transport = std::make_shared<VerifiedTlsTransport>(lower, mHostname, stateChangeCallback);
 #endif
 
 		std::atomic_store(&mTlsTransport, transport);

+ 1 - 1
test/websocket.cpp

@@ -63,7 +63,7 @@ void test_websocket() {
 		}
 	});
 
-	ws->open("wss://echo.websocket.org/");
+	ws->open("wss://echo.websocket.org:443/");
 
 	int attempts = 10;
 	while ((!ws->isOpen() || !received) && attempts--)