Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-beta' into tmp | Rainer Gerhards | 2010-01-26 | 11 | -31/+79 |
|\ | | | | | | | | | Conflicts: ChangeLog | ||||
| * | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-01-26 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| | * | bugfix: potential segfault on queue shutdown | varmojfekoj | 2010-01-26 | 2 | -9/+16 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | did some adoptions necessary to use the bugfix with v4-beta code base | Rainer Gerhards | 2010-01-26 | 1 | -6/+6 |
| | | | |||||
| * | | Merge branch 'queuepatch' into v4-betanew | Rainer Gerhards | 2010-01-26 | 2 | -10/+18 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| | * | | bugfixes for potential segfaults during queue shutdown | varmojfekoj | 2010-01-26 | 1 | -9/+14 |
| | |/ | | | | | | | | | | | | | | | | (bugs require certain non-standard settings to appear) Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | bugfix: -d did not enable display of debug messages | Rainer Gerhards | 2010-01-19 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug | ||||
| * | | bugfix: blanks inside file names did not terminate file name parsing. | Rainer Gerhards | 2010-01-19 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | This could reslult in the whole rest of a line (including comments) to be treated as file name in "write to file" actions. Thanks to Jack for reporting this issue. | ||||
| * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-01-19 | 2 | -4/+4 |
| |\| | |||||
| | * | Fix a typo regarding syslog.h and syslog(3) | Michael Biebl | 2010-01-19 | 2 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | bugfix: rsyslog hangs when writing to a named pipe which nobody was reading. | Rainer Gerhards | 2010-01-15 | 4 | -11/+33 |
| | | | | | | | | | | | | Thanks to Michael Biebl for reporting this bug. | ||||
| * | | Merge branch 'v4-beta-memleak' into v4-beta | Rainer Gerhards | 2010-01-12 | 2 | -0/+8 |
| |\ \ | |||||
| | * | | fixed a memory leak when sending messages in zip-compressed format | Naoya Nakazawa | 2010-01-11 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | doc bugfix: "-h" option no longer exists | Rainer Gerhards | 2010-01-12 | 1 | -7/+3 |
| |/ / | |||||
* | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-12-04 | 3 | -1/+10 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
| |\| | |||||
| | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
| | |\ | |||||
| | | * | bugfix: potential segfault when -p command line option was used | Rainer Gerhards | 2009-12-04 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug | ||||
| * | | | bugfix: hostname accidently set to IP address for some message sources | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | for example imudp. Thanks to Anton for reporting this bug. | ||||
* | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
|\| | | | |||||
| * | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| |\| | | |||||
| | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| | |\| | |||||
| | | * | bugfix: $CreateDirs variable not properly initialized | Rainer Gerhards | 2009-11-30 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | default thus was random (but most often "on") | ||||
* | | | | added at least minimal doc for $EscapeControlCharacterTab | Rainer Gerhards | 2009-11-27 | 1 | -0/+1 |
| | | | | |||||
* | | | | added $EscapeControlCharacterTab config directive | Jonathan Bond-Caron | 2009-11-27 | 3 | -6/+11 |
| | | | | |||||
* | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-25 | 2 | -1/+6 |
|\| | | | |||||
| * | | | bugfix (kind of): check if TCP connection is still alive if using TLS | Jonathan Bond-Caron | 2009-11-25 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | debugondemand mode caused backgrounding to fail | Rainer Gerhards | 2009-11-20 | 4 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | This is close to a bug, but I'd consider the ability to background in this mode a new feature... | ||||
* | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-20 | 3 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | | preparing for 4.5.7v4.5.7 | Rainer Gerhards | 2009-11-18 | 5 | -3/+5 |
| | | | | |||||
* | | | | worked a bit on "unlimited select()" patch | Rainer Gerhards | 2009-11-17 | 3 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | - potential segfault in gss-misc.c - glbl interface needed different version ID - some compile time warning cleanup | ||||
* | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-17 | 4 | -26/+48 |
|\| | | | |||||
| * | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-17 | 4 | -26/+48 |
| |\| | | |||||
| | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-17 | 4 | -26/+48 |
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c | ||||
| | | * | minor doc: enhanced description of loadable modules | Rainer Gerhards | 2009-11-17 | 1 | -17/+36 |
| | | | | |||||
| | | * | correcting -q/-Q patch - was invalid | Rainer Gerhards | 2009-11-12 | 3 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options. | ||||
* | | | | integrating varmojfekoj's "unlimited select()" patch into v4-devel | Rainer Gerhards | 2009-11-17 | 13 | -32/+187 |
|\ \ \ \ | |||||
| * | | | | added option to use unlimited-size select() calls | varmojfekoj | 2009-11-17 | 12 | -31/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to varmjofekoj for the patch Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | Merge branch 'oracle' into v4-devel | Rainer Gerhards | 2009-11-12 | 2 | -11/+64 |
|\ \ \ \ \ | |||||
| * | | | | | Give even better output | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -9/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell which statement is failing, which element in the batch, and give its details. | ||||
| * | | | | | Improve the debug messages | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Improve traceability while testing. | ||||
| * | | | | | Debug output to find out a crash | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | Report errors when OCI_SUCCESS_WITH_INFO happens | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -1/+29 |
| | | | | | | |||||
| * | | | | | Improve the handling of OCI_SUCCESS_WITH_INFO. | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop considering it as an error, and make it display the information from the Oracle server. | ||||
| * | | | | | doc | Luis Fernando Munoz Mejias | 2009-11-12 | 2 | -8/+9 |
| | | | | | | |||||
| * | | | | | If the server disconnects the handle is no longer valid and we need to | Luis Fernando Munoz Mejias | 2009-11-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call tryResume(), so we have to return RS_RET_SUSPENDED. Otherwise, we may keep losing messages until rsyslog is restarted. | ||||
* | | | | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-11-12 | 3 | -4/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2009-11-12 | 3 | -4/+9 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | cosmetic: mention imported v3-bugfix in ChangeLog | Rainer Gerhards | 2009-11-12 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2009-11-12 | 3 | -4/+7 |
| | |\ \ \ | | | | |/ | | | |/| |