fix conflict with master

CMakeLists_Headers.txt

@@ -7,6 +7,7 @@ set(COMMON_KERNEL_HEADERS
 	src/kernel/SleepRequest.h
 	src/kernel/ExecRequest.h
 	src/kernel/IORequest.h
+	src/kernel/TransRequest.h
 	src/kernel/Executor.h
 	src/kernel/list.h
 	src/kernel/mpoller.h
@@ -57,12 +58,15 @@ set(INCLUDE_HEADERS
 	src/protocol/dns_parser.h
 	src/protocol/DnsMessage.h
 	src/protocol/DnsUtil.h
+	src/protocol/WebSocketMessage.h
+	src/protocol/websocket_parser.h
 	src/server/WFServer.h
 	src/server/WFDnsServer.h
 	src/server/WFHttpServer.h
 	src/server/WFRedisServer.h
 	src/server/WFMySQLServer.h
 	src/client/WFMySQLConnection.h
+	src/client/WFWebSocketClient.h
 	src/client/WFDnsClient.h
 	src/manager/DnsCache.h
 	src/manager/WFGlobal.h
@@ -72,6 +76,7 @@ set(INCLUDE_HEADERS
 	src/manager/WFFuture.h
 	src/manager/WFFacilities.h
 	src/manager/WFFacilities.inl
+	src/manager/WFCondition.h
 	src/util/EncodeStream.h
 	src/util/LRUCache.h
 	src/util/StringUtil.h
@@ -88,6 +93,8 @@ set(INCLUDE_HEADERS
 	src/factory/WFAlgoTaskFactory.inl
 	src/factory/Workflow.h
 	src/factory/WFOperator.h
+	src/factory/WFChannel.h
+	src/factory/WFChannel.inl
 	src/nameservice/WFNameService.h
 	src/nameservice/WFDnsResolver.h
 	src/nameservice/WFServiceGovernance.h
@@ -106,3 +113,4 @@ if(KAFKA STREQUAL "y")
 		src/factory/KafkaTaskImpl.inl
 	)
 endif()
+

src/protocol/CMakeLists.txt

@@ -8,12 +8,14 @@ set(SRC
 	mysql_stream.c
 	mysql_parser.c
 	mysql_byteorder.c
+	websocket_parser.c
 	DnsMessage.cc
 	DnsUtil.cc
 	MySQLMessage.cc
 	MySQLResult.cc
 	HttpMessage.cc
 	RedisMessage.cc
+	WebSocketMessage.cc
 	HttpUtil.cc
 	SSLWrapper.cc
 )