From 56278341320e3ae7759724fcb9fa300f3969b433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Guti=C3=A9rrez=20de=20Quevedo=20P=C3=A9?= =?UTF-8?q?rez?= Date: Tue, 9 Sep 2014 21:52:03 +0200 Subject: [PATCH] FIX: building without SSL --- src/Proxy.cpp | 2 ++ src/Socket.cpp | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Proxy.cpp b/src/Proxy.cpp index 6036442..319417c 100644 --- a/src/Proxy.cpp +++ b/src/Proxy.cpp @@ -261,8 +261,10 @@ void Proxy::run(string &peer_address) outside.writeLine(strtemp); strtemp=""; string ssltls=""; + #ifdef HAVE_SSL if (outside.is_ssl_enabled()) ssltls=" (SSL/TLS)"; + #endif //HAVE_SSL if(cfg.getAddHeaders()) { diff --git a/src/Socket.cpp b/src/Socket.cpp index 615464a..131fa6a 100644 --- a/src/Socket.cpp +++ b/src/Socket.cpp @@ -294,7 +294,11 @@ string Socket::readLine() } while(c!=10&&!isClosed()); - LDEB("r" + string(ssl_enabled?"s":"") + ">" + s.str()); + LDEB(string("r") + + #ifdef HAVE_SSL + string(ssl_enabled?"s":"") + + #endif //HAVE_SSL + ">" + s.str()); return s.str(); } @@ -344,7 +348,11 @@ void Socket::writeByte(char c) void Socket::writeLine(string s) { - LDEB("w" + string(ssl_enabled?"s":"") + ">" + s); + LDEB(string("w") + + #ifdef HAVE_SSL + string(ssl_enabled?"s":"") + + #endif //HAVE_SSL + ">" + s); s+="\r\n"; writeBytes((void *)s.c_str(),s.length());