Merge branch 'candidate-6.4.14'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/thorhelper/roxiehelper.cpp

@@ -1798,6 +1798,7 @@ public:
     {
         if (compressing())
         {
+#ifdef _USE_ZLIB
             ZlibCompressionType zt = ZlibCompressionType::GZIP;
             if (compression==HttpCompression::DEFLATE)
                 zt  = ZlibCompressionType::DEFLATE;
@@ -1819,6 +1820,9 @@ public:
 
             sock->write(mb.toByteArray(), mb.length());
             sent += mb.length();
+#else
+            throw MakeStringException(-1, "_USE_ZLIB is required for compressed output");
+#endif
         }
         return sent;
     }

common/thorhelper/thorsoapcall.cpp

@@ -29,9 +29,7 @@
 #include "securesocket.hpp"
 #include "eclrtl.hpp"
 #include "roxiemem.hpp"
-#ifdef _USE_ZLIB
 #include "zcrypt.hpp"
-#endif
 
 using roxiemem::OwnedRoxieString;
 

esp/logging/test/CMakeLists.txt

@@ -58,6 +58,11 @@ HPCC_ADD_EXECUTABLE ( logging_test ${SRCS} )
 
 target_link_libraries ( logging_test
          jlib
-         securesocket
          loggingmanager
     )
+    
+IF (USE_OPENSSL)
+    target_link_libraries ( logging_test 
+        securesocket
+    )
+ENDIF()

esp/services/espcontrol/CMakeLists.txt

@@ -57,5 +57,12 @@ target_link_libraries ( ws_espcontrol
          jlib
          xmllib
          esphttp
-         securesocket
     )
+    
+IF (USE_OPENSSL)
+    target_link_libraries ( ws_espcontrol 
+        securesocket
+    )
+ENDIF()
+
+