summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-tcpsrv-mt'v6.1.5Rainer Gerhards2011-03-0413-90/+440
|\ | | | | | | | | Conflicts: ChangeLog
| * added new tls-based test to testbenchRainer Gerhards2011-02-283-2/+21
| |
| * some cleanupRainer Gerhards2011-02-282-34/+5
| |
| * Merge branch 'master' into master-tcpsrv-mtRainer Gerhards2011-02-2857-271/+2099
| |\
| * | completed new TLS code in tcpfloodRainer Gerhards2011-02-282-24/+53
| | |
| * | experiemental milestone: tcpflood support buffering in TLS modeRainer Gerhards2011-02-041-2/+30
| | | | | | | | | | | | This needs to be checked, it is not yet 100% correct
| * | fixed very recent regression in tcpsrv.c & some cleanupRainer Gerhards2011-02-021-7/+6
| | | | | | | | | | | | forgot a debugging abort() ;)
| * | added support for TLS (in anon mode) to tcpfloodRainer Gerhards2011-02-024-6/+130
| | |
| * | (somewhat) improved TLS subsystemRainer Gerhards2011-02-013-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 wellRainer Gerhards2011-01-312-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 racesRainer Gerhards2011-01-316-12/+33
| | |
| * | interim commit: current debug state of new imptcpRainer Gerhards2011-01-282-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 requestsRainer Gerhards2011-01-272-6/+25
| | |
| * | experimental: added thread pool to tcpsrv epoll handlerRainer Gerhards2011-01-272-26/+126
| | | | | | | | | | | | | | | this seems to work in lab, but is brand-new code. needs practice drill.
* | | Merge branch 'v5-beta'Rainer Gerhards2011-03-012-1/+18
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | bugfix: potential abort condition when $RepeatedMsgReduction set to onRainer Gerhards2011-03-012-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 testbenchRainer Gerhards2011-03-016-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 Gerhards2011-02-2522-26/+214
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 5.7.6v5.7.6Rainer Gerhards2011-02-253-3/+3
| | |
| * | bugfix: fixed a memory leak and potential abort conditionRainer Gerhards2011-02-253-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 aidRainer Gerhards2011-02-251-1/+0
| | |
| * | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2011-02-251-2/+5
| |\ \
| | * \ Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2011-02-241-0/+4
| | |\ \
| | * | | bugfix: testbench failed when omuxsock was not selected in ./configureRainer Gerhards2011-02-241-1/+4
| | | | |
| | * | | bugfix: testbench failed when imptcp was not selectedRainer Gerhards2011-02-241-1/+1
| | | | |
| * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-02-252-1/+14
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | bugfix: memory leak when $RepeatedMsgReduction on was usedRainer Gerhards2011-02-252-0/+9
| | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
| * | | | fixed compile problems on SolarisRainer Gerhards2011-02-231-0/+4
| | |/ / | |/| |
| * | | fixed testsuite problems during make distcheckv5.7.5Rainer Gerhards2011-02-233-5/+5
| | | |
| * | | added debug support for trying to find well-hidden bugRainer Gerhards2011-02-232-1/+12
| | | |
| * | | preparing for 5.7.5 releaseRainer Gerhards2011-02-233-3/+3
| | | |
| * | | bugfix (minor): warning message suggested invalid compatibility modeRainer Gerhards2011-02-221-1/+1
| | | |
| * | | added one more test for imuxsock to autmatted test suiteRainer Gerhards2011-02-227-13/+62
| | | | | | | | | | | | | | | | control character escaping is now also being tested
| * | | the last fix introduced another regression, fixed nowRainer Gerhards2011-02-221-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 Gerhards2011-02-222-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 imuxsockRainer Gerhards2011-02-219-1/+74
| | | |
| * | | fixed dumb but important typo in code...Rainer Gerhards2011-02-211-1/+1
| | | | | | | | | | | | | | | | thanks to Michael Biebl for alterting me
| * | | bugfix: imuxsock did no longer remove trailing LFRainer Gerhards2011-02-212-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-debugRainer Gerhards2011-02-211-1/+0
| | | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-183-1/+42
|\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | | enhance: imfile did not yet support multiple rulesets, now addedRainer Gerhards2011-02-183-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.4Rainer Gerhards2011-02-183-4/+23
| | | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-1817-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-betaRainer Gerhards2011-02-172-5/+2
| |\ \ \
| | * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-02-172-5/+2
| | |\| |
| | | * | bugfix: testbench was not activated if no Java was present on systemRainer Gerhards2011-02-172-5/+2
| | | | | | | | | | | | | | | | | | | | ... what actually was a left-over. Java is no longer required.
| * | | | bugfix: minor race condition in action.c - considered cosmeticRainer Gerhards2011-02-174-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.4Rainer Gerhards2011-02-173-3/+3
| |/ / /
| * | | bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-166-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 removedRainer Gerhards2011-02-163-10/+6
| | | |