HttpHeader::GetHeader: (used only in tests) return empty string if got nothing and use standard "\r\n" line ending

1 files changed, 6 insertions, 3 deletions

diff --git a/xbmc/utils/HttpHeader.cpp b/xbmc/utils/HttpHeader.cpp
index 27f25799d3..1671f04061 100644
--- a/xbmc/utils/HttpHeader.cpp
+++ b/xbmc/utils/HttpHeader.cpp
@@ -164,12 +164,15 @@ std::vector<std::string> CHttpHeader::GetValues(std::string strParam) const
 
 std::string CHttpHeader::GetHeader(void) const
 {
-  std::string strHeader(m_protoLine + '\n');
+  if (m_protoLine.empty() && m_params.empty())
+    return "";
+
+  std::string strHeader(m_protoLine + "\r\n");
 
   for (HeaderParams::const_iterator iter = m_params.begin(); iter != m_params.end(); ++iter)
-    strHeader += ((*iter).first + ": " + (*iter).second + "\n");
+    strHeader += ((*iter).first + ": " + (*iter).second + "\r\n");
 
-  strHeader += "\n";
+  strHeader += "\r\n";
   return strHeader;
 }