summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-02-18 03:27:12 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-02-18 03:27:12 +0100
commit5beea4eb7ebb8938cc2ef73cbb16e215897d0708 (patch)
tree519e68a23c7c34ddaebfd25cc5c3b3db6e95cd49
parent80588fba818b746d43adf978d09933fda79b5e1f (diff)
Fix TemplateFileServer writing empty messages resulting in zero length DataBlocks being created and later passed to SocketIO::Send()
Found while testing m_ssl_gnutls, fix suggested by @Adam-
-rw-r--r--modules/webcpanel/template_fileserver.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/webcpanel/template_fileserver.cpp b/modules/webcpanel/template_fileserver.cpp
index d4e5ec7e4..dc950b330 100644
--- a/modules/webcpanel/template_fileserver.cpp
+++ b/modules/webcpanel/template_fileserver.cpp
@@ -220,8 +220,11 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
Log() << "Invalid INCLUDE in web template " << this->file_name;
else
{
- reply.Write(finished); // Write out what we have currently so we insert this files contents here
- finished.clear();
+ if (!finished.empty())
+ {
+ reply.Write(finished); // Write out what we have currently so we insert this files contents here
+ finished.clear();
+ }
TemplateFileServer tfs(tokens[1]);
tfs.Serve(server, page_name, client, message, reply, r);
@@ -255,7 +258,7 @@ void TemplateFileServer::Serve(HTTPProvider *server, const Anope::string &page_n
}
}
- reply.Write(finished);
- return;
+ if (!finished.empty())
+ reply.Write(finished);
}