[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0-70-g4d6cc1d

[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  4d6cc1dbc67eccda84d875a85e1295261ce9a26b (commit)
       via  2d25f12cda60ebaf8448f79ff94ee84c2969b329 (commit)
       via  d8481cb7cd344e4d729b35202b4cb83a1f887d8b (commit)
      from  4929c840cd2657763b812fb3e72b23b3a41b9d77 (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 4d6cc1dbc67eccda84d875a85e1295261ce9a26b
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 22 17:47:54 2014 +0200

    json-file: improve error handling
    
    If the functions getting uri, etc fail. Return "unknown" instead of
    NULL pointer. This improves consistency.

commit 2d25f12cda60ebaf8448f79ff94ee84c2969b329
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 22 17:45:45 2014 +0200

    json-file: check pointer before using
    
    A check was missing to see if ht_ud was not null before using the
    pointer. This should be rare, but it can happen.
    
    Reported-by: Will Metcalf

commit d8481cb7cd344e4d729b35202b4cb83a1f887d8b
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Apr 22 17:14:10 2014 +0200

    stream: improve retransmission handling
    
    Improve retransmission handling in the CLOSE_WAIT state.
    
    Bug #1180.

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

Summary of changes:
 src/output-json-file.c |   14 +++++++-----
 src/stream-tcp.c       |   57 ++++++++++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
OISF