Browse Source

Merge branch 'ST2_0311_traceToServer' into ST2_0508_httpHeader

chenliangyu 5 months ago
parent
commit
cb80532922

+ 0 - 2
Module/mod_chromium/CWebsocketServer.cpp

@@ -1209,8 +1209,6 @@ namespace Chromium {
 		}
 		else if (ConfigManager::getInstance().m_connection_ws_sm2_hdls.find(dstHdl) != ConfigManager::getInstance().m_connection_ws_sm2_hdls.end())
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("dstHdl:%d, save:%d", dstHdl,
-				ConfigManager::getInstance().m_connection_ws_sm2_hdls[dstHdl].lock().get());
 			if(ConfigManager::getInstance().m_ws_sm2_hdls_manager[dstHdl]->getState() == SM2ProtocolState::WAIT_KEY_EXCHANGE)
 				m_ws_sm2_server.send(ConfigManager::getInstance().m_connection_ws_sm2_hdls[dstHdl], msg, websocketpp::frame::opcode::TEXT, dstExption);
 			else

+ 1 - 1
addin/cmake/DependencyConanFiles.cmake

@@ -69,7 +69,7 @@ if(MSVC)
 			#mod_chromium
 			CEFControl/1.0@LR04.02_ThirdParty/testing
 			#mod_chromium
-			cefclient_mutable/2.0.53@LR04.02_ThirdParty/testing
+			cefclient_mutable/2.0.55@LR04.02_ThirdParty/testing
 			#libaudiorender
 			speex/1.2.1@LR04.02_ThirdParty/testing
 			#libvideoframework