Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-tcpsrv-mt'v6.1.5 | Rainer Gerhards | 2011-03-04 | 13 | -90/+440 |
|\ | | | | | | | | | Conflicts: ChangeLog | ||||
| * | added new tls-based test to testbench | Rainer Gerhards | 2011-02-28 | 3 | -2/+21 |
| | | |||||
| * | some cleanup | Rainer Gerhards | 2011-02-28 | 2 | -34/+5 |
| | | |||||
| * | Merge branch 'master' into master-tcpsrv-mt | Rainer Gerhards | 2011-02-28 | 57 | -271/+2099 |
| |\ | |||||
| * | | completed new TLS code in tcpflood | Rainer Gerhards | 2011-02-28 | 2 | -24/+53 |
| | | | |||||
| * | | experiemental milestone: tcpflood support buffering in TLS mode | Rainer Gerhards | 2011-02-04 | 1 | -2/+30 |
| | | | | | | | | | | | | This needs to be checked, it is not yet 100% correct | ||||
| * | | fixed very recent regression in tcpsrv.c & some cleanup | Rainer Gerhards | 2011-02-02 | 1 | -7/+6 |
| | | | | | | | | | | | | forgot a debugging abort() ;) | ||||
| * | | added support for TLS (in anon mode) to tcpflood | Rainer Gerhards | 2011-02-02 | 4 | -6/+130 |
| | | | |||||
| * | | (somewhat) improved TLS subsystem | Rainer Gerhards | 2011-02-01 | 3 | -26/+15 |
| | | | | | | | | | | | | | | | | | | - improved TLS error reporting - improved TLS startup (Diffie-Hellman bits do not need to be generated, as we do not support full anon key exchange -- we always need certs) | ||||
| * | | tcpsrv select-handler experimentally moved to multi-threading as well | Rainer Gerhards | 2011-01-31 | 2 | -14/+45 |
| | | | | | | | | | | | | | | | first tests done with plain tcp, TLS subsystems tests need to be carried out. No serious lab testing done so far. | ||||
| * | | fixing regression: multi-threading had races | Rainer Gerhards | 2011-01-31 | 6 | -12/+33 |
| | | | |||||
| * | | interim commit: current debug state of new imptcp | Rainer Gerhards | 2011-01-28 | 2 | -17/+37 |
| | | | | | | | | | | | | | | | | | | I need to verify the concept used in a simpler environment, and this means I probably need to freeze the (non-working) state here for a couple of days. | ||||
| * | | resolved problem with intermixing requests | Rainer Gerhards | 2011-01-27 | 2 | -6/+25 |
| | | | |||||
| * | | experimental: added thread pool to tcpsrv epoll handler | Rainer Gerhards | 2011-01-27 | 2 | -26/+126 |
| | | | | | | | | | | | | | | | this seems to work in lab, but is brand-new code. needs practice drill. | ||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-01 | 2 | -1/+18 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | bugfix: potential abort condition when $RepeatedMsgReduction set to on | Rainer Gerhards | 2011-03-01 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as well as potentially in a number of other places where MsgDup() was used. This only happened when the imudp input module was used and it depended on name resolution not yet had taken place. In other words, this was a strange problem that could lead to hard to diagnose instability. So if you experience instability, chances are good that this fix will help. | ||||
* | | | | improved testbench | Rainer Gerhards | 2011-03-01 | 6 | -1/+55 |
| |_|/ |/| | | | | | | | | | | | - added valgrind-based test (the first one ever ;)) - fixed memory leak in imdiag (guess how this was detected...) | ||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 22 | -26/+214 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | preparing for 5.7.6v5.7.6 | Rainer Gerhards | 2011-02-25 | 3 | -3/+3 |
| | | | |||||
| * | | bugfix: fixed a memory leak and potential abort condition | Rainer Gerhards | 2011-02-25 | 3 | -10/+26 |
| | | | | | | | | | | | | | | | | | | | | | this could happen if multiple rulesets were used and some output batches contained messages belonging to more than one ruleset. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218 | ||||
| * | | cosmetic: removing commented-out testing aid | Rainer Gerhards | 2011-02-25 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta | Rainer Gerhards | 2011-02-25 | 1 | -2/+5 |
| |\ \ | |||||
| | * \ | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta | Rainer Gerhards | 2011-02-24 | 1 | -0/+4 |
| | |\ \ | |||||
| | * | | | bugfix: testbench failed when omuxsock was not selected in ./configure | Rainer Gerhards | 2011-02-24 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | bugfix: testbench failed when imptcp was not selected | Rainer Gerhards | 2011-02-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-02-25 | 2 | -1/+14 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | bugfix: memory leak when $RepeatedMsgReduction on was used | Rainer Gerhards | 2011-02-25 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225 | ||||
| * | | | | fixed compile problems on Solaris | Rainer Gerhards | 2011-02-23 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
| * | | | fixed testsuite problems during make distcheckv5.7.5 | Rainer Gerhards | 2011-02-23 | 3 | -5/+5 |
| | | | | |||||
| * | | | added debug support for trying to find well-hidden bug | Rainer Gerhards | 2011-02-23 | 2 | -1/+12 |
| | | | | |||||
| * | | | preparing for 5.7.5 release | Rainer Gerhards | 2011-02-23 | 3 | -3/+3 |
| | | | | |||||
| * | | | bugfix (minor): warning message suggested invalid compatibility mode | Rainer Gerhards | 2011-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | added one more test for imuxsock to autmatted test suite | Rainer Gerhards | 2011-02-22 | 7 | -13/+62 |
| | | | | | | | | | | | | | | | | control character escaping is now also being tested | ||||
| * | | | the last fix introduced another regression, fixed now | Rainer Gerhards | 2011-02-22 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | The previous fix left variable lenMsg in an inconsistent state when sanitization actually happend. This could lead to message truncation. | ||||
| * | | | bugfix: imuxsock does not sanitization at all (regression) | Rainer Gerhards | 2011-02-22 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | This also causes problems when NUL characters are present inside the message (as is the case with spamd). | ||||
| * | | | improved testbench, added tests for imuxsock | Rainer Gerhards | 2011-02-21 | 9 | -1/+74 |
| | | | | |||||
| * | | | fixed dumb but important typo in code... | Rainer Gerhards | 2011-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | thanks to Michael Biebl for alterting me | ||||
| * | | | bugfix: imuxsock did no longer remove trailing LF | Rainer Gerhards | 2011-02-21 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression from the imuxsock partial rewrite. Happened because the message is no longer run through the standard parsers. Now imuxsock does this sanitization itself. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=224 | ||||
| * | | | regression: fixed compile error with --enable-debug | Rainer Gerhards | 2011-02-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 3 | -1/+42 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c | ||||
| * | | | enhance: imfile did not yet support multiple rulesets, now added | Rainer Gerhards | 2011-02-18 | 3 | -1/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug. | ||||
* | | | | preparing for 6.1.4 releasev6.1.4 | Rainer Gerhards | 2011-02-18 | 3 | -4/+23 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 17 | -41/+108 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| * | | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta | Rainer Gerhards | 2011-02-17 | 2 | -5/+2 |
| |\ \ \ | |||||
| | * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-02-17 | 2 | -5/+2 |
| | |\| | | |||||
| | | * | | bugfix: testbench was not activated if no Java was present on system | Rainer Gerhards | 2011-02-17 | 2 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | ... what actually was a left-over. Java is no longer required. | ||||
| * | | | | bugfix: minor race condition in action.c - considered cosmetic | Rainer Gerhards | 2011-02-17 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is considered cosmetic as multiple threads tried to write exactly the same value into the same memory location without sync. The method has been changed so this can no longer happen. | ||||
| * | | | | preparing for 5.7.4 releasev5.7.4 | Rainer Gerhards | 2011-02-17 | 3 | -3/+3 |
| |/ / / | |||||
| * | | | bugfix: fixed compile problem due to empty structs | Dražen Kačar | 2011-02-16 | 6 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | this occured only on some platforms/compilers. thanks to Dražen Kačar for the fix Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | cleanup: no longer parameter in iminternal system removed | Rainer Gerhards | 2011-02-16 | 3 | -10/+6 |
| | | | |