diff --git a/src/XrdHTTP/XrdHttpProtocol.cc b/src/XrdHTTP/XrdHttpProtocol.cc index 258c674496a..2d38ed27f02 100644 --- a/src/XrdHTTP/XrdHttpProtocol.cc +++ b/src/XrdHTTP/XrdHttpProtocol.cc @@ -35,7 +35,7 @@ #include "XrdHttpTrace.hh" #include "XrdHttpProtocol.hh" //#include "XrdXrootd/XrdXrootdStats.hh" -#include + #include #include "XrdHttpUtils.hh" #include "XrdHttpSecXtractor.hh" @@ -1283,7 +1283,7 @@ int XrdHttpProtocol::InitSecurity() { const SSL_METHOD *meth; meth = SSLv23_method(); - sslctx = SSL_CTX_new(meth); + sslctx = SSL_CTX_new((SSL_METHOD *)meth); SSL_CTX_set_options(sslctx, SSL_OP_NO_SSLv2); SSL_CTX_set_session_cache_mode(sslctx, SSL_SESS_CACHE_SERVER); SSL_CTX_set_session_id_context(sslctx, s_server_session_id_context, diff --git a/src/XrdHTTP/XrdHttpReq.cc b/src/XrdHTTP/XrdHttpReq.cc index 24c2e1abfbd..02704f3cf98 100644 --- a/src/XrdHTTP/XrdHttpReq.cc +++ b/src/XrdHTTP/XrdHttpReq.cc @@ -48,7 +48,6 @@ #include "Xrd/XrdLink.hh" #include "XrdXrootd/XrdXrootdBridge.hh" #include "Xrd/XrdBuffer.hh" -#include #include #include @@ -1334,8 +1333,8 @@ int XrdHttpReq::PostProcessHTTPReq(bool final) { else p += "-"; p += ""; - p += "" + boost::lexical_cast (e.flags) + "" - "" + boost::lexical_cast (e.size) + "" + p += "" + itos(e.flags) + "" + "" + itos(e.size) + "" "" + ISOdatetime(e.modtime) + "" "" " (e.size); + stringresp += itos(e.size); stringresp += "\n"; @@ -1840,7 +1839,7 @@ int XrdHttpReq::PostProcessHTTPReq(bool final) { // File size stringresp += ""; - stringresp += boost::lexical_cast (e.size); + stringresp += itos(e.size); stringresp += "\n"; stringresp += ""; diff --git a/src/XrdHTTP/XrdHttpUtils.cc b/src/XrdHTTP/XrdHttpUtils.cc index 2d26cf12490..b702c213959 100644 --- a/src/XrdHTTP/XrdHttpUtils.cc +++ b/src/XrdHTTP/XrdHttpUtils.cc @@ -139,7 +139,13 @@ void Tobase64(const unsigned char *input, int length, char *out) { +// Simple itoa function +std::string itos(long i) { + char buf[128]; + sprintf(buf, "%ld", i); + return buf; +} diff --git a/src/XrdHTTP/XrdHttpUtils.hh b/src/XrdHTTP/XrdHttpUtils.hh index 6d4704fc96f..583cfc980e7 100644 --- a/src/XrdHTTP/XrdHttpUtils.hh +++ b/src/XrdHTTP/XrdHttpUtils.hh @@ -46,6 +46,8 @@ // Return 0 if OK int parseURL(char *url, char *host, int &port, char **path); +// Simple itoa function +std::string itos(long i); void calcHashes( char *hash,