diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:52:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:52:59 +0200 |
| commit | ddd427cf5cb6fea314845940ff1ada8b0bb51b31 (patch) | |
| tree | b18d3033b9af59538792e1447fe54cc7a8ffb702 | |
| parent | 7eb5a5c5bd74ef43c8dc3331bac6dc48d9e6d825 (diff) | |
| parent | 47ca77faca5442014309e6d2ffa3c0484d160da4 (diff) | |
| download | rsyslog-ddd427cf5cb6fea314845940ff1ada8b0bb51b31.tar.gz rsyslog-ddd427cf5cb6fea314845940ff1ada8b0bb51b31.tar.xz rsyslog-ddd427cf5cb6fea314845940ff1ada8b0bb51b31.zip | |
Merge branch 'v4-beta' into v4-devel
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/omfwd.c | 4 |
3 files changed, 6 insertions, 3 deletions
@@ -276,6 +276,9 @@ version before switching to this one. - bugfix: memory leak in ompgsql Thanks to Ken for providing the patch --------------------------------------------------------------------------- +Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? +- bugfix: sending syslog messages with zip compression did not work +--------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) diff --git a/configure.ac b/configure.ac index 598e4fa3..6d22566b 100644 --- a/configure.ac +++ b/configure.ac @@ -415,7 +415,7 @@ if test "x$enable_mysql" = "xyes"; then [yes],,, ) if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then - AC_MSG_FAILURE([mysql_config not found in PATH]) + AC_MSG_FAILURE([mysql_config not found in PATH - usually a package named mysql-dev, libmysql-dev or similar, is missing - install it to fix this issue]) fi AC_CHECK_LIB( [mysqlclient], diff --git a/tools/omfwd.c b/tools/omfwd.c index e41e5b66..d207cce5 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -436,11 +436,11 @@ CODESTARTdoAction */ if(pData->compressionLevel && (l > MIN_SIZE_FOR_COMPRESS)) { Bytef *out; - uLongf destLen = sizeof(out) / sizeof(Bytef); + uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ uLong srcLen = l; int ret; /* TODO: optimize malloc sequence? -- rgerhards, 2008-09-02 */ - CHKmalloc(out = (Bytef*) malloc(iMaxLine + iMaxLine/100 + 12)); + CHKmalloc(out = (Bytef*) malloc(destLen)); out[0] = 'z'; out[1] = '\0'; ret = compress2((Bytef*) out+1, &destLen, (Bytef*) psz, |