Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 43 | -647/+645 |
|\ | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | ||||
| * | more license analysis & change | Rainer Gerhards | 2012-01-14 | 11 | -178/+163 |
| | | |||||
| * | rsyslog.conf.5 socket module example sb imuxsock | Jim Hill | 2012-01-14 | 1 | -1/+1 |
| | | |||||
| * | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 |
| | | |||||
| * | some more files to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 7 | -108/+104 |
| | | |||||
| * | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 20 | -294/+316 |
| | | | | | | | | after carful check for copyright holder | ||||
* | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 |
| | | |||||
* | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 2 | -5/+7 |
| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 2 | -0/+3 |
| | | |||||
* | | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 | ||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 4 | -4/+49 |
|\| | |||||
| * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 2 | -4/+4 |
| | | |||||
| * | added doc for omprog | Rainer Gerhards | 2011-12-16 | 3 | -0/+45 |
| | | |||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
|\| | | | | | | | | | Conflicts: action.c | ||||
| * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
| |\ | |||||
| | * | bugfix: action resume interval incorrectly handled, thus took longer to resume | Tomas Heinrich | 2011-12-01 | 2 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 2 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
|\| | | |||||
| * | | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
|\| | | |||||
| * | | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 2 | -3/+15 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 3 | -3/+3 |
| | | | |||||
* | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 5 | -6/+18 |
| | | | |||||
* | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-21 | 2 | -5/+5 |
|\ \ \ | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-20 | 2 | -5/+5 |
| |\| | | |||||
| | * | | doc bugfix: pri-text neees to be fixed in an article as well | Rainer Gerhards | 2011-10-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | doc bug: property pri-text was incorrectly described | Rainer Gerhards | 2011-10-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | minor: slightly improved error reporting when dynafile open fails | Rainer Gerhards | 2011-10-20 | 1 | -2/+3 |
|/ / / | |||||
* | | | bugfix: $OMFileFlushInterval period was doubled - now using correct value | Rainer Gerhards | 2011-10-18 | 2 | -1/+2 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
|\| | | |||||
| * | | doc: clarified that imklog does not support Solaris | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-17 | 3 | -9/+54 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | doc: mention imported bugfix in ChangeLog | Rainer Gerhards | 2011-10-13 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-13 | 2 | -1/+2 |
| |\| | | |||||
| | * | | bugfix: $ActionExecOnlyOnce interval did not work properly | Tomas Heinrich | 2011-10-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | bugfix: race condition when extracting structured data and PROCID | Rainer Gerhards | 2011-10-13 | 2 | -5/+25 |
| | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME | ||||
| * | | | bugfix: race condition when extracting program name and APPNAME | Rainer Gerhards | 2011-10-13 | 2 | -5/+27 |
| | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names | ||||
* | | | | bugfix: ActionQueue could malfunction due to index error | Vlad Grigorescu | 2011-10-17 | 2 | -9/+11 |
|/ / / | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 3 | -6/+12 |
| | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas. | ||||
* | | | fixed compiler warnings in tcpflood.c | Rainer Gerhards | 2011-10-06 | 1 | -2/+3 |
| | | | |||||
* | | | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 3 | -4/+5 |
| | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover. | ||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-09-22 | 3 | -6/+40 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c | ||||
| * | | bugfix: potential abort if ultra-large file io buffers are used and | Rainer Gerhards | 2011-09-20 | 2 | -4/+15 |
| | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms) | ||||
| * | | Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable | Rainer Gerhards | 2011-09-15 | 101 | -381/+5139 |
| |\ \ | |||||
| | * \ | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0 | Rainer Gerhards | 2011-09-07 | 101 | -381/+5139 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html | ||||
| | | * | | preparing for 4.7.5 releasev4.7.5 | Rainer Gerhards | 2011-08-31 | 3 | -3/+3 |
| | | | | | |||||
| | | * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 2 | -4/+6 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | | | Added changelog entry | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| | | | | | |