adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 17:03:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

HTTPSock: Gzip compression for static files (text/* mime types + files

Browse Source 
with .js extension) and dynamic HTML responses (if gzip is available and
the compression method is supported by the requesting HTTP client).
This commit is contained in:
Ingmar Runge
2013-03-08 09:40:36 +01:00
parent ea5406f334
commit ea94795646
3 changed files with 184 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+36
View File
@@ -107,6 +107,10 @@ AC_ARG_ENABLE( [openssl],
AS_HELP_STRING([--disable-openssl], [disable openssl]),
[SSL="$enableval"],
[SSL="auto"])
AC_ARG_ENABLE( [zlib],
AS_HELP_STRING([--disable-zlib], [disable zlib]),
[ZLIB="$enableval"],
[ZLIB="auto"])
AC_ARG_ENABLE( [perl],
AS_HELP_STRING([--enable-perl], [enable perl]),
[PERL="$enableval"],
@@ -311,6 +315,37 @@ else
NOSSL=1
fi
# ----- Check for zlib
old_ZLIB="$ZLIB"
if test "x$ZLIB" != "xno"; then
AC_MSG_CHECKING([whether zlib is usable])
my_saved_LIBS="$LIBS"
appendLib "-lz"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include "zlib.h"
]], [[
z_stream zs;
(void) deflateInit2(&zs, 0, 0, 0, 0, 0);
(void) deflate(&zs, 0);
]])
], [
AC_MSG_RESULT([yes])
ZLIB=yes
], [
AC_MSG_RESULT([no])
ZLIB=no
])
if test "x$ZLIB" = "xno"; then
ZNC_AUTO_FAIL([ZLIB],
[zlib was not found. Try --disable-zlib],
[zlib was not found and thus disabled])
LIBS="$my_saved_LIBS"
else
AC_DEFINE([HAVE_ZLIB], [1], [Define if zlib is available])
fi
fi
AC_ARG_WITH( [module-prefix],
AS_HELP_STRING([--with-module-prefix], [module object code [LIBDIR/znc]]),
[MODDIR=$withval],
@@ -596,6 +631,7 @@ if test x"$CHARSET" = "x" ; then
else
echo "charset: yes"
fi
echo "zlib: $ZLIB"
echo "run from src: $RUNFROMSOURCE"
echo
echo "Now you can run \"$GNUMAKE\" to compile ZNC"
include/znc/HTTPSock.h
+5
View File
@@ -11,6 +11,7 @@
#include <znc/zncconfig.h>
#include <znc/Socket.h>
#include <znc/FileUtils.h>
class CModule;
@@ -83,6 +84,9 @@ private:
static size_t GetParamValues(const CString& sName, VCString& vsRet, const std::map<CString, VCString>& msvsParams, const CString& sFilter);
static size_t GetParamValues(const CString& sName, std::set<CString>& ssRet, const std::map<CString, VCString>& msvsParams, const CString& sFilter);
void WriteFileUncompressed(CFile& File);
void WriteFileGzipped(CFile& File);
protected:
void PrintPage(const CString& sPage);
void Init();
@@ -104,6 +108,7 @@ protected:
MCString m_msHeaders;
bool m_bHTTP10Client;
CString m_sIfNoneMatch;
bool m_bAcceptGzip;
MCString m_msRequestCookies;
MCString m_msResponseCookies;
};
src/HTTPSock.cpp
+143 -14
View File
@@ -14,6 +14,10 @@
#include <sstream>
#include <iomanip>
#ifdef HAVE_ZLIB
#include <zlib.h>
#endif
using std::map;
using std::set;
@@ -34,6 +38,7 @@ void CHTTPSock::Init() {
m_bPost = false;
m_bDone = false;
m_bHTTP10Client = false;
m_bAcceptGzip = false;
m_uPostLen = 0;
EnableReadLine();
SetMaxBufferThreshold(10240);
@@ -120,6 +125,11 @@ void CHTTPSock::ReadLine(const CString& sData) {
} else if (sName.Equals("If-None-Match:")) {
// this is for proper client cache support (HTTP 304) on static files:
m_sIfNoneMatch = sLine.Token(1, true);
} else if (sName.Equals("Accept-Encoding:") && !m_bHTTP10Client) {
SCString ssEncodings;
// trimming whitespace from the tokens is important:
sLine.Token(1, true).Split(",", ssEncodings, false, "", "", false, true);
m_bAcceptGzip = (ssEncodings.find("gzip") != ssEncodings.end());
} else if (sLine.empty()) {
m_bGotHeader = true;
@@ -162,7 +172,55 @@ void CHTTPSock::GetPage() {
OnPageRequest(m_sURI);
}
#ifdef HAVE_ZLIB
static bool InitZlibStream(z_stream *zStrm, const char* buf) {
memset(zStrm, 0, sizeof(z_stream));
zStrm->next_in = (Bytef*)buf;
// "15" is the default value for good compression,
// the weird "+ 16" means "please generate a gzip header and trailer".
const int WINDOW_BITS = 15 + 16;
const int MEMLEVEL = 8;
return (deflateInit2(zStrm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
WINDOW_BITS, MEMLEVEL, Z_DEFAULT_STRATEGY) == Z_OK);
}
#endif
void CHTTPSock::PrintPage(const CString& sPage) {
#ifdef HAVE_ZLIB
if (m_bAcceptGzip && !SentHeader()) {
char szBuf[4096];
z_stream zStrm;
int zStatus, zFlush = Z_NO_FLUSH;
if (InitZlibStream(&zStrm, sPage.c_str())) {
DEBUG("- Sending gzip-compressed.");
AddHeader("Content-Encoding", "gzip");
PrintHeader(0); // we do not know the compressed data's length
zStrm.avail_in = sPage.size();
do {
if (zStrm.avail_in == 0) {
zFlush = Z_FINISH;
}
zStrm.next_out = (Bytef*)szBuf;
zStrm.avail_out = sizeof(szBuf);
zStatus = deflate(&zStrm, zFlush);
if((zStatus == Z_OK || zStatus == Z_STREAM_END) && zStrm.avail_out < sizeof(szBuf)) {
Write(szBuf, sizeof(szBuf) - zStrm.avail_out);
}
} while(zStatus == Z_OK);
Close(Csock::CLT_AFTERWRITE);
return;
}
} // else: fall through
#endif
if (!SentHeader()) {
PrintHeader(sPage.length());
} else {
@@ -248,20 +306,19 @@ bool CHTTPSock::PrintFile(const CString& sFileName, CString sContentType) {
return true;
}
char szBuf[4096];
off_t iLen = 0;
ssize_t i = 0;
PrintHeader(iSize, sContentType);
// while we haven't reached iSize and read() succeeds...
while (iLen < iSize && (i = File.Read(szBuf, sizeof(szBuf))) > 0) {
Write(szBuf, i);
iLen += i;
}
if (i < 0) {
DEBUG("- Error while reading file: " << strerror(errno));
#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 {
DEBUG("- Sending gzip-compressed.");
AddHeader("Content-Encoding", "gzip");
PrintHeader(0, sContentType); // we do not know the compressed data's length
WriteFileGzipped(File);
}
}
@@ -272,6 +329,78 @@ bool CHTTPSock::PrintFile(const CString& sFileName, CString sContentType) {
return true;
}
void CHTTPSock::WriteFileUncompressed(CFile& File) {
char szBuf[4096];
off_t iLen = 0;
ssize_t i = 0;
off_t iSize = File.GetSize();
// while we haven't reached iSize and read() succeeds...
while (iLen < iSize && (i = File.Read(szBuf, sizeof(szBuf))) > 0) {
Write(szBuf, i);
iLen += i;
}
if (i < 0) {
DEBUG("- Error while reading file: " << strerror(errno));
}
}
void CHTTPSock::WriteFileGzipped(CFile& File) {
#ifdef HAVE_ZLIB
char szBufIn[8192];
char szBufOut[8192];
off_t iFileSize = File.GetSize(), iFileReadTotal = 0;
z_stream zStrm;
int zFlush = Z_NO_FLUSH;
int zStatus;
if (!InitZlibStream(&zStrm, szBufIn)) {
DEBUG("- Error initializing zlib!");
return;
}
do {
ssize_t iFileRead = 0;
if (zStrm.avail_in == 0) {
// input buffer is empty, try to read more data from file.
// if there is no more data, finish the stream.
if (iFileReadTotal < iFileSize) {
iFileRead = File.Read(szBufIn, sizeof(szBufIn));
if (iFileRead < 1) {
// wtf happened? better quit compressing.
iFileReadTotal = iFileSize;
zFlush = Z_FINISH;
} else {
iFileReadTotal += iFileRead;
zStrm.next_in = (Bytef*)szBufIn;
zStrm.avail_in = iFileRead;
}
} else {
zFlush = Z_FINISH;
}
}
zStrm.next_out = (Bytef*)szBufOut;
zStrm.avail_out = sizeof(szBufOut);
zStatus = deflate(&zStrm, zFlush);
if ((zStatus == Z_OK || zStatus == Z_STREAM_END) && zStrm.avail_out < sizeof(szBufOut)) {
// there's data in the buffer:
Write(szBufOut, sizeof(szBufOut) - zStrm.avail_out);
}
} while (zStatus == Z_OK);
deflateEnd(&zStrm);
#endif
}
void CHTTPSock::ParseURI() {
ParseParams(m_sURI.Token(1, true, "?"), m_msvsGETParams);
m_sURI = m_sURI.Token(0, false, "?");