Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

adding support for debian 8 build #131

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

adding support for debian 8 build #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a786f8
adding support for debian 8 build
tryggvil Feb 24, 2016
d6b17a2
Adding support for running behind a ssl proxy with X-Forwarded-Proto …
tryggvil Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions install_prereqs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ case $DISTRO in
echo 'git, svn-devel, autotools, gcc, g++, boost, openssl-devel and libpng-devel. For tracing to work, libdwarf is also required'
exit 1
;;
Debian*8*)
apt-get -y install git-core build-essential openssl libpng-dev libboost-all-dev libpng-dev libdwarf-dev subversion subversion-tools cmake
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please also add "libssl-dev" into the packages list as by @c64cosmin comment?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also "pkg-config" must be added, or else FindOpenSSL.cmake will fail.

exit 1
;;
*)
echo 'Distro not found! You shall need git, svn-devel, autotools, gcc, g++, boost, openssl-devel and libpng-devel to successfully build this package.'
echo 'For tracing to work, libdwarf is also required.'
Expand Down
7 changes: 5 additions & 2 deletions wsgate/wsgateEHS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,11 @@ namespace wsgate{
MimeType mt = simpleMime(to_lower_copy(basename));
if (HTML == mt) {
ostringstream oss;

oss << (request->Secure() ? "wss://" : "ws://") << thisHost << "/wsgate";
bool is_secure = request->Secure();
if (request->Headers("X-Forwarded-Proto").compare("https") == 0) {
is_secure=true;
}
oss << (is_secure ? "wss://" : "ws://") << thisHost << "/wsgate";

replace_all(body, "%WSURI%", oss.str());
replace_all(body, "%JSDEBUG%", (bDynDebug ? "-debug" : ""));
Expand Down