iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of empty CHTTPSock::WriteFileGzipped method if there's no zlib. It's still in the header, but this does not have any negative side effects.

Browse Source
This commit is contained in:
Ingmar Runge
2013-03-10 00:28:19 +01:00
parent ea94795646
commit b0101a6df1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/HTTPSock.cpp
View File

@@ -307,18 +307,18 @@ bool CHTTPSock::PrintFile(const CString& sFileName, CString sContentType) {
}
#ifdef HAVE_ZLIB
bool bGzip = (sContentType.Left(5).Equals("text/") || sFileName.Right(3).Equals(".js"));
#else
bool bGzip = false; // hello optimizer
#endif
if (!bGzip || !m_bAcceptGzip) {
PrintHeader(iSize, sContentType);
WriteFileUncompressed(File);
} else {
bool bGzip = m_bAcceptGzip && (sContentType.Left(5).Equals("text/") || sFileName.Right(3).Equals(".js"));
if (bGzip) {
DEBUG("- Sending gzip-compressed.");
AddHeader("Content-Encoding", "gzip");
PrintHeader(0, sContentType); // we do not know the compressed data's length
WriteFileGzipped(File);
} else
#endif
{
PrintHeader(iSize, sContentType);
WriteFileUncompressed(File);
}
}
@@ -346,8 +346,8 @@ void CHTTPSock::WriteFileUncompressed(CFile& File) {
}
}
void CHTTPSock::WriteFileGzipped(CFile& File) {
#ifdef HAVE_ZLIB
void CHTTPSock::WriteFileGzipped(CFile& File) {
char szBufIn[8192];
char szBufOut[8192];
off_t iFileSize = File.GetSize(), iFileReadTotal = 0;
@@ -398,8 +398,8 @@ void CHTTPSock::WriteFileGzipped(CFile& File) {
} while (zStatus == Z_OK);
deflateEnd(&zStrm);
#endif
}
#endif
void CHTTPSock::ParseURI() {
ParseParams(m_sURI.Token(1, true, "?"), m_msvsGETParams);