From df2642e9311b6d4d29729ac6a7d9ef65206afc89 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 13 Jan 2017 13:34:44 -0600
Subject: [PATCH] Revert "Windows build fixes (disable compiling
 permessage-deflate, which isn't very useful right now.  The build error will
 probably be resolved in websocketpp by the time we need it)"

This reverts commit 2bd8e92a756c4e9e3d43c6e5c2aebddaf6b7db27.
---
 CMakeLists.txt                 |  1 -
 src/network/http/websocket.cpp | 42 +++++-----------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e6b1b..f1bcdce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,7 +317,6 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/udt4/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
-    ${ZLIB_INCLUDE_DIR}
   )
 
 #target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index b8a3d3c..81a7cad 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -1,19 +1,9 @@
 #include <fc/network/http/websocket.hpp>
-
-#ifndef WIN32 
-// websocket++ currently does not build correctly with permessage deflate enabled
-// since chrome does not work with websocketpp's implementation of permessage-deflate
-// yet, I'm just disabling it on windows instead of trying to fix the build error.
-# define ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-#endif
-
 #include <websocketpp/config/asio_client.hpp>
 #include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/config/asio_client.hpp>
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-# include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-#endif
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
 #include <websocketpp/client.hpp>
 #include <websocketpp/logger/stub.hpp>
 
@@ -66,8 +56,7 @@ namespace fc { namespace http {
           // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
       };
-
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+      
       struct asio_with_stub_log_and_deflate : public websocketpp::config::asio {
           typedef asio_with_stub_log_and_deflate type;
           typedef asio base;
@@ -109,7 +98,6 @@ namespace fc { namespace http {
           // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
       };
-#endif ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
 
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
           typedef asio_tls_stub_log type;
@@ -144,7 +132,6 @@ namespace fc { namespace http {
               transport_type;
       };
 
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
       struct asio_tls_stub_log_and_deflate : public websocketpp::config::asio_tls {
           typedef asio_tls_stub_log_and_deflate type;
           typedef asio_tls base;
@@ -182,7 +169,6 @@ namespace fc { namespace http {
           typedef websocketpp::extensions::permessage_deflate::enabled
               <permessage_deflate_config> permessage_deflate_type;
       };
-#endif
 
       using websocketpp::connection_hdl;
 
@@ -527,18 +513,10 @@ namespace fc { namespace http {
    } // namespace detail
 
    websocket_server::websocket_server(bool enable_permessage_deflate /* = true */) :
-      my( 
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-          enable_permessage_deflate ? 
+      my( enable_permessage_deflate ? 
             (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log_and_deflate> : 
-#endif
             (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log> ) 
-   {
-#ifndef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-     if (enable_permessage_deflate)
-       elog("Websocket permessage-deflate requested but not enabled during compile");
-#endif
-   }
+   {}
    websocket_server::~websocket_server(){}
 
    void websocket_server::on_connection( const on_connection_handler& handler )
@@ -565,18 +543,10 @@ namespace fc { namespace http {
    websocket_tls_server::websocket_tls_server(const string& server_pem, 
                                               const string& ssl_password, 
                                               bool enable_permessage_deflate /* = true */) :
-      my(
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-          enable_permessage_deflate ? 
+      my( enable_permessage_deflate ? 
             (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log_and_deflate>(server_pem, ssl_password) : 
-#endif
             (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log>(server_pem, ssl_password) ) 
-   {
-#ifndef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-     if (enable_permessage_deflate)
-       elog("Websocket permessage-deflate requested but not enabled during compile");
-#endif
-   }
+   {}
    websocket_tls_server::~websocket_tls_server(){}
 
    void websocket_tls_server::on_connection( const on_connection_handler& handler )