ps/hermes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FIX: building without SSL

Browse source
This commit is contained in:
Juan José Gutiérrez de Quevedo Pérez 2014-09-09 21:52:03 +02:00
parent 98f429601a
commit 5627834132
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Proxy.cpp
View file

@ -261,8 +261,10 @@ void Proxy::run(string &peer_address)
outside.writeLine(strtemp); outside.writeLine(strtemp);
strtemp=""; strtemp="";
string ssltls=""; string ssltls="";
#ifdef HAVE_SSL
if (outside.is_ssl_enabled()) if (outside.is_ssl_enabled())
ssltls=" (SSL/TLS)"; ssltls=" (SSL/TLS)";
#endif //HAVE_SSL
if(cfg.getAddHeaders()) if(cfg.getAddHeaders())
{ {

12
src/Socket.cpp
View file

@ -294,7 +294,11 @@ string Socket::readLine()
} }
while(c!=10&&!isClosed()); 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(); return s.str();
} }
@ -344,7 +348,11 @@ void Socket::writeByte(char c)
void Socket::writeLine(string s) 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"; s+="\r\n";
writeBytes((void *)s.c_str(),s.length()); writeBytes((void *)s.c_str(),s.length());