PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-31 09:04:14 +00:00
Code Issues Releases Activity

Minor bugfixes for windows.

Browse Source
This commit is contained in:
EinMByte 2015-09-27 16:55:39 +02:00
parent c9080f9f72
commit 73725774dc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/HTTPServer.cpp
View File

@ -11,7 +11,7 @@ namespace util {
HTTPConnection::HTTPConnection(boost::asio::ip::tcp::socket* socket, HTTPConnection::HTTPConnection(boost::asio::ip::tcp::socket* socket,
std::shared_ptr<client::i2pcontrol::I2PControlSession> session) std::shared_ptr<client::i2pcontrol::I2PControlSession> session)
: m_Socket(socket), m_BufferLen(0), m_Session(session) : m_Socket(socket), m_BufferLen(0), m_Request(), m_Reply(), m_Session(session)
{ {
} }
@ -128,7 +128,7 @@ std::string HTTPConnection::GetFileContents(const std::string& filename, bool pr
const std::string address_str = address.string(); const std::string address_str = address.string();
std::ifstream ifs(address_str); std::ifstream ifs(address_str, std::ios_base::in | std::ios_base::binary);
if(e || !ifs || !isAllowed(address_str)) if(e || !ifs || !isAllowed(address_str))
throw std::runtime_error("Cannot load " + address_str + "."); throw std::runtime_error("Cannot load " + address_str + ".");
@ -154,7 +154,7 @@ void HTTPConnection::HandleRequest()
try { try {
m_Reply = i2p::util::http::Response(200, GetFileContents(uri, true)); m_Reply = i2p::util::http::Response(200, GetFileContents(uri, true));
m_Reply.setHeader("Content-Type", i2p::util::http::getMimeType(uri)); m_Reply.setHeader("Content-Type", i2p::util::http::getMimeType(uri) + "; charset=UTF-8");
SendReply(); SendReply();
} catch(const std::runtime_error&) { } catch(const std::runtime_error&) {
// Cannot open the file for some reason, send 404 // Cannot open the file for some reason, send 404

3
core/util/HTTP.cpp
View File

@ -207,7 +207,8 @@ std::string preprocessContent(const std::string& content, const std::string& pat
// Read the contents of the included file // Read the contents of the included file
std::ifstream ifs( std::ifstream ifs(
boost::filesystem::canonical(directory / std::string(match[1]), e).string() boost::filesystem::canonical(directory / std::string(match[1]), e).string(),
std::ios_base::in | std::ios_base::binary
); );
if(e || !ifs) if(e || !ifs)
continue; continue;