From ed9bb798892fe87997e02f99bfc18683bedba30e Mon Sep 17 00:00:00 2001
From: "Oleg.Korshul" <Oleg.Korshul@onlyoffice.com>
Date: Thu, 1 Jul 2021 15:29:31 +0300
Subject: [PATCH] Add zlib for ixwebsocket

---
 .../WebSocket/src/managerWebSocket.cpp        | 11 +++++--
 .../src/socketrocket/socketRocket_objc.mm     |  4 +--
 Common/Network/WebSocket/websocket.pri        | 31 ++++++++++++++++---
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/Common/Network/WebSocket/src/managerWebSocket.cpp b/Common/Network/WebSocket/src/managerWebSocket.cpp
index 9d9639307d..1cb7ced998 100644
--- a/Common/Network/WebSocket/src/managerWebSocket.cpp
+++ b/Common/Network/WebSocket/src/managerWebSocket.cpp
@@ -46,14 +46,21 @@ namespace NSNetwork
 	{
 	    std::shared_ptr<IWebSocket> createWebsocket(const std::string& type, std::shared_ptr<IListener> listener, const std::string& url)
 	    {
+            std::string sType = type;
+            if (sType.empty())
+            {
+                // TODO: default engine for platform
+                sType = "ixwebsocket";
+            }
+
 #ifdef USE_IXWEBSOCKET
-            if (type == "ixwebsocket")
+            if (sType == "ixwebsocket")
 		    {
                 return std::make_shared<CIXWebSocket>(url, listener);
 		    }
 #endif
 #ifdef USE_SOCKETROCKET
-            if (type == "socketRocket")
+            if (sType == "socketRocket")
             {
                 return std::make_shared<CSocketRocket>(url, listener);
             }
diff --git a/Common/Network/WebSocket/src/socketrocket/socketRocket_objc.mm b/Common/Network/WebSocket/src/socketrocket/socketRocket_objc.mm
index 0eaa465547..02af35d187 100644
--- a/Common/Network/WebSocket/src/socketrocket/socketRocket_objc.mm
+++ b/Common/Network/WebSocket/src/socketrocket/socketRocket_objc.mm
@@ -32,7 +32,7 @@
 
 
 #import "socketRocket_objc.h"
-#import "../../../../../DesktopEditor/Common/Mac/NSString+StringUtils.h"
+#import "../../../../../DesktopEditor/common/Mac/NSString+StringUtils.h"
 
 @implementation SocketRocketObjC
 
@@ -87,7 +87,7 @@
     }
 }
 
-- (void)setListener: (NSWebSocket::IListener*)listener
+- (void)setListener: (NSNetwork::NSWebSocket::IListener*)listener
 {
     m_listener = listener;
 }
diff --git a/Common/Network/WebSocket/websocket.pri b/Common/Network/WebSocket/websocket.pri
index 41fab48668..6a33864521 100644
--- a/Common/Network/WebSocket/websocket.pri
+++ b/Common/Network/WebSocket/websocket.pri
@@ -10,12 +10,35 @@ SOURCES += $$PWD/src/managerwebsocket.cpp
 
 ixwebsocket {
 
-	DEFINES += USE_IXWEBSOCKET
-	include($$PWD/../../3dParty/ixwebsocket/ixwebsocket.pri)
+    DEFINES += USE_IXWEBSOCKET
+    include($$PWD/../../3dParty/ixwebsocket/ixwebsocket.pri)
 
-	HEADERS += $$PWD/src/ixwebsocket/ixwebsocket_internal.h
-	SOURCES += $$PWD/src/ixwebsocket/ixwebsocket_internal.cpp
+    HEADERS += $$PWD/src/ixwebsocket/ixwebsocket_internal.h
+    SOURCES += $$PWD/src/ixwebsocket/ixwebsocket_internal.cpp
 
+    CONFIG += use_zlib
+
+}
+
+use_zlib {
+    ZLIB_SOURCES = $$PWD/../../../OfficeUtils/src/zlib-1.2.11
+    INCLUDEPATH += $$ZLIB_SOURCES
+    SOURCES += \
+        $$ZLIB_SOURCES/adler32.c \
+        $$ZLIB_SOURCES/compress.c \
+        $$ZLIB_SOURCES/crc32.c \
+        $$ZLIB_SOURCES/deflate.c \
+        $$ZLIB_SOURCES/gzclose.c \
+        $$ZLIB_SOURCES/gzlib.c \
+        $$ZLIB_SOURCES/gzread.c \
+        $$ZLIB_SOURCES/gzwrite.c \
+        $$ZLIB_SOURCES/infback.c \
+        $$ZLIB_SOURCES/inffast.c \
+        $$ZLIB_SOURCES/inflate.c \
+        $$ZLIB_SOURCES/inftrees.c \
+        $$ZLIB_SOURCES/trees.c \
+        $$ZLIB_SOURCES/uncompr.c \
+        $$ZLIB_SOURCES/zutil.c
 }
 
 socketrocket {