Skip to content

Commit

Permalink
Merge pull request #101 in CON/conduit from feature/2016_02_conduit_i…
Browse files Browse the repository at this point in the history
…o_ssl_support to master

* commit '839a4efd99cf621a02384cb593f1e54926eb980e':
  created WebRequestHandler Interface to allow lib users to implement their own server request handers pulled Visualizer server logic out of the main WebServer class, and implemented it using a WebRequestHandler
  extra warnings and temp fix for rest path (we still need to factor out the visualizer case ) added ssl option to rest and websocket tests
  cleaned up comments in conduit_web
  provide ssl option to conduit::io::WebServer added test that includes a self signed cert created according civetweb example when using ssl with the visualizer websocket / rest connection isn't working yet.
  • Loading branch information
cyrush committed Feb 25, 2016
2 parents 5f4f376 + 839a4ef commit 44c7322
Show file tree
Hide file tree
Showing 11 changed files with 758 additions and 231 deletions.
4 changes: 3 additions & 1 deletion src/libs/conduit_io/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/Conduit_IO_Config.hpp.in"
set(conduit_io_headers
conduit_io.hpp
conduit_web.hpp
conduit_web_visualizer.hpp
Conduit_IO_Exports.hpp
${CMAKE_CURRENT_BINARY_DIR}/Conduit_IO_Config.hpp)

Expand All @@ -76,7 +77,8 @@ set(conduit_io_headers
#
set(conduit_io_sources
conduit_io.cpp
conduit_web.cpp)
conduit_web.cpp
conduit_web_visualizer.cpp)

if(HDF5_FOUND)
list(APPEND conduit_io_headers conduit_hdf5.hpp)
Expand Down
2 changes: 1 addition & 1 deletion src/libs/conduit_io/conduit_io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@


#include "conduit_web.hpp"

#include "conduit_web_visualizer.hpp"

// include optional libs

Expand Down
Loading

0 comments on commit 44c7322

Please sign in to comment.