[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0RC2-7-gfae2836

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  fae2836039ef56daebcc222e41be3b4ad445b27c (commit)
       via  efdd9e08f2b5dd1dac6a9ed8355a79b11d84cc12 (commit)
       via  64017cd29bf77aefed42bb1010f2e4bb1c9cac6c (commit)
       via  136c6440c84ae0fe7a88b31c44bc65798c49a8d4 (commit)
       via  006cd5ae3681c6d4bd6718e113e070dcb2f4b825 (commit)
       via  a74a8c874f81fc805223fdc84cf70d23c64a8570 (commit)
       via  2582e61af74793b3a773c3823a5972e2af710c78 (commit)
      from  e94bf9726db3b0d9d7448160f5f92a0c3f5328fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fae2836039ef56daebcc222e41be3b4ad445b27c
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Dec 11 16:05:42 2015 +0100

    http: more sane body inspection/tracking defaults

commit efdd9e08f2b5dd1dac6a9ed8355a79b11d84cc12
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Dec 10 16:12:05 2015 +0100

    http: improve body pruning
    
    In case the body wasn't inspected the body_inspected variable wouldn't
    get updated leading to the body not getting pruned at all.
    
    This patch adds support for this case.

commit 64017cd29bf77aefed42bb1010f2e4bb1c9cac6c
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Dec 10 09:58:52 2015 +0100

    ips/drop-log: fix crash on logging drops
    
    When logging drops for fragmented UDP packets, triggered by detection
    in the reassembled packet, a missing check could lead to access of the
    packets UDP header pointer when it was NULL.

commit 136c6440c84ae0fe7a88b31c44bc65798c49a8d4
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 13 10:45:18 2015 +0100

    http file: fix txid type

commit 006cd5ae3681c6d4bd6718e113e070dcb2f4b825
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 13 10:38:21 2015 +0100

    file: sync file and tx id types

commit a74a8c874f81fc805223fdc84cf70d23c64a8570
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Dec 1 15:20:19 2015 +0100

    smtp: reset inspection buffers

commit 2582e61af74793b3a773c3823a5972e2af710c78
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 13 14:06:32 2015 +0100

    http: fix body prune check

-----------------------------------------------------------------------

Summary of changes:
 src/app-layer-htp-body.c | 11 ++++++++++-
 src/app-layer-htp-file.c |  2 +-
 src/app-layer-htp-file.h |  2 +-
 src/app-layer-htp.c      | 12 ++++++------
 src/detect.c             |  1 +
 src/log-droplog.c        | 36 ++++++++++++++++++++----------------
 src/output-json-drop.c   | 28 ++++++++++++++++------------
 src/util-file.c          |  4 ++--
 src/util-file.h          |  8 ++++----
 suricata.yaml.in         |  8 ++++----
 10 files changed, 65 insertions(+), 47 deletions(-)


hooks/post-receive
-- 
OISF