commit 2f1ebcd18ca79f4bf19a0924a0b26a8436f24f6c
author Ed Tanous <ed@tanous.net> Wed Feb 13 19:39:07 2019 -0800
committer Ed Tanous <ed.tanous@intel.com> Wed Feb 20 09:05:18 2019 -0800
tree c83ad70c63b996e5bfaf6cf0d77993df6e25537b
parent aad1a257275632029d5400971e786633b5ffb6fa

bmcweb: Resolve build error with non-SSL builds

Resolves #40

Tested by:
Built with BMCWEB_INSECURE_DISABLE_SSL.  Build suceeded.

Change-Id: I3641e18b097d54c21720728ec72999e963e668a3
Signed-off-by: Ed Tanous <ed@tanous.net>

CMakeLists.txt.in

diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index a964e2d..ddbb3ab 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -36,8 +36,8 @@
 
 externalproject_add (
     Boost URL
-    https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz
-    URL_MD5 5d8b4503582fffa9eefdb9045359c239 SOURCE_DIR
+    https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.gz
+    URL_MD5 b50944c0c13f81ce2c006802a1186f5a SOURCE_DIR
     "${CMAKE_BINARY_DIR}/boost-src" BINARY_DIR "${CMAKE_BINARY_DIR}/boost-build"
     CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND mkdir -p
     "${CMAKE_BINARY_DIR}/prefix/include/" && cp -R

crow/include/crow/http_connection.h

diff --git a/crow/include/crow/http_connection.h b/crow/include/crow/http_connection.h
index 6f1dafd..bd2a824 100644
--- a/crow/include/crow/http_connection.h
+++ b/crow/include/crow/http_connection.h
@@ -6,7 +6,9 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ssl.hpp>
 #include <boost/beast/core/flat_static_buffer.hpp>
+#include <boost/beast/experimental/core/ssl_stream.hpp>
 #include <boost/beast/http.hpp>
 #include <boost/beast/websocket.hpp>
 #include <chrono>
@@ -18,11 +20,6 @@
 #include "crow/timer_queue.h"
 #include "crow/utility.h"
 
-#ifdef BMCWEB_ENABLE_SSL
-#include <boost/asio/ssl.hpp>
-#include <boost/beast/experimental/core/ssl_stream.hpp>
-#endif
-
 namespace crow
 {
 

crow/include/crow/http_server.h

diff --git a/crow/include/crow/http_server.h b/crow/include/crow/http_server.h
index e8cb762..75b49a4 100644
--- a/crow/include/crow/http_server.h
+++ b/crow/include/crow/http_server.h
@@ -4,6 +4,8 @@
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/signal_set.hpp>
+#include <boost/asio/ssl/context.hpp>
+#include <boost/beast/experimental/core/ssl_stream.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <chrono>
 #include <cstdint>
@@ -15,10 +17,6 @@
 #include "crow/http_connection.h"
 #include "crow/logging.h"
 #include "crow/timer_queue.h"
-#ifdef BMCWEB_ENABLE_SSL
-#include <boost/asio/ssl/context.hpp>
-#include <boost/beast/experimental/core/ssl_stream.hpp>
-#endif
 
 namespace crow
 {