summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-08 16:37:01 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-08 16:37:01 +0200
commit17e24eae733a0bce0eda65947e7559a05c91fc9c (patch)
tree7700d4db0522d2219c940a009a6fd33b9990d2a9
parent2f35a69a59ec08fc00b50b6e75827bc934cfeb09 (diff)
parent50d9939148055123015eeb7aca7e83de5ab0084b (diff)
downloadrsyslog-17e24eae733a0bce0eda65947e7559a05c91fc9c.tar.gz
rsyslog-17e24eae733a0bce0eda65947e7559a05c91fc9c.tar.xz
rsyslog-17e24eae733a0bce0eda65947e7559a05c91fc9c.zip
Merge branch 'aaron' into v4-beta
-rw-r--r--ChangeLog2
-rw-r--r--runtime/debug.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf399c57..7980d411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Version 4.5.6 [v4-beta] (rgerhards), 2009-09-??
Version 4.5.5 [v4-beta] (rgerhards), 2009-09-??
- added $InputTCPServerNotifyOnConnectionClose config directive
see doc for details
+- bugfix: debug string larger than 1K were improperly displayed. Max size
+ is now 32K
- bugfix: invalid storage class selected for some size config parameters.
This resulted in wrong values. The most prominent victim was the
directory creation mode, which was set to zero in some cases. For
diff --git a/runtime/debug.c b/runtime/debug.c
index 807fd3f7..1b592ef3 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -841,7 +841,7 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg)
static pthread_t ptLastThrdID = 0;
static int bWasNL = 0;
char pszThrdName[64]; /* 64 is to be on the safe side, anything over 20 is bad... */
- char pszWriteBuf[1024];
+ char pszWriteBuf[32*1024];
size_t lenWriteBuf;
struct timespec t;
uchar *pszObjName = NULL;