← Back to branch summary

~ubuntu-branches/debian/sid/rsyslog/sid

« back to all changes in this revision

Viewing changes to plugins/imtcp/imtcp.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl, Michael Biebl, Daniel Pocock
  • Date: 2014-03-11 19:52:49 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20140311195249-phbsh9be8lebawti
Tags: 7.4.8-1
http://bugs.debian.org/740869
http://bugs.debian.org/721277
[ Michael Biebl ]
* New upstream release.
* Update Build-Depends:
  - Bump libestr-dev to (>= 0.1.9).
  - Tighten liblognorm-dev to (<< 1.0.0).
  - Replace libjson0-dev with libjson-c-dev, we no longer need the
    transitional package.
* Bump Standards-Version to 3.9.5. No further changes.

[ Daniel Pocock ]
* Make template parameter not mandatory in mongodb output plugin. Patch
  cherry-picked from upstream Git. (Closes: #740869, #721277)
* Ensure JSON templates are NUL terminated. Patch cherry-picked from
  upstream Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/imtcp/imtcp.c
408
408
        loadModConf->iTCPLstnMax = 20;
409
409
        loadModConf->bSuppOctetFram = 1;
410
410
        loadModConf->iStrmDrvrMode = 0;
411
 
        loadModConf->bUseFlowControl = 0;
 
411
        loadModConf->bUseFlowControl = 1;
412
412
        loadModConf->bKeepAlive = 0;
413
413
        loadModConf->bEmitMsgOnClose = 0;
414
414
        loadModConf->iAddtlFrameDelim = TCPSRV_NO_ADDTL_DELIMITER;
631
631
        cs.iTCPLstnMax = 20;
632
632
        cs.bSuppOctetFram = 1;
633
633
        cs.iStrmDrvrMode = 0;
634
 
        cs.bUseFlowControl = 0;
 
634
        cs.bUseFlowControl = 1;
635
635
        cs.bKeepAlive = 0;
636
636
        cs.bEmitMsgOnClose = 0;
637
637
        cs.iAddtlFrameDelim = TCPSRV_NO_ADDTL_DELIMITER;