summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-tcpsrv-mt'v6.1.5Rainer Gerhards2011-03-0413-90/+440
|\
| * 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
| * | fixed very recent regression in tcpsrv.c & some cleanupRainer Gerhards2011-02-021-7/+6
| * | added support for TLS (in anon mode) to tcpfloodRainer Gerhards2011-02-024-6/+130
| * | (somewhat) improved TLS subsystemRainer Gerhards2011-02-013-26/+15
| * | tcpsrv select-handler experimentally moved to multi-threading as wellRainer Gerhards2011-01-312-14/+45
| * | fixing regression: multi-threading had racesRainer Gerhards2011-01-316-12/+33
| * | interim commit: current debug state of new imptcpRainer Gerhards2011-01-282-17/+37
| * | resolved problem with intermixing requestsRainer Gerhards2011-01-272-6/+25
| * | experimental: added thread pool to tcpsrv epoll handlerRainer Gerhards2011-01-272-26/+126
* | | Merge branch 'v5-beta'Rainer Gerhards2011-03-012-1/+18
|\ \ \
| * | | bugfix: potential abort condition when $RepeatedMsgReduction set to onRainer Gerhards2011-03-012-1/+11
* | | | improved testbenchRainer Gerhards2011-03-016-1/+55
| |_|/ |/| |
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-2522-26/+214
|\ \ \ | |/ /
| * | 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
| * | 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
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | bugfix: memory leak when $RepeatedMsgReduction on was usedRainer Gerhards2011-02-252-0/+9
| * | | | 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
| * | | the last fix introduced another regression, fixed nowRainer Gerhards2011-02-221-5/+8
| * | | bugfix: imuxsock does not sanitization at all (regression)Rainer Gerhards2011-02-222-6/+6
| * | | improved testbench, added tests for imuxsockRainer Gerhards2011-02-219-1/+74
| * | | fixed dumb but important typo in code...Rainer Gerhards2011-02-211-1/+1
| * | | bugfix: imuxsock did no longer remove trailing LFRainer Gerhards2011-02-212-0/+9
| * | | regression: fixed compile error with --enable-debugRainer Gerhards2011-02-211-1/+0
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-183-1/+42
|\ \ \ \ | |/ / /
| * | | enhance: imfile did not yet support multiple rulesets, now addedRainer Gerhards2011-02-183-1/+42
* | | | preparing for 6.1.4 releasev6.1.4Rainer Gerhards2011-02-183-4/+23
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-1817-41/+108
|\ \ \ \ | |/ / /
| * | | 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
| * | | | bugfix: minor race condition in action.c - considered cosmeticRainer Gerhards2011-02-174-14/+20
| * | | | 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
| * | | cleanup: no longer parameter in iminternal system removedRainer Gerhards2011-02-163-10/+6