git.ipfire.org Git - thirdparty/snort3.git/commit

author	Steve Chew (stechew) <stechew@cisco.com>
	Thu, 4 Mar 2021 18:55:08 +0000 (18:55 +0000)
committer	Steve Chew (stechew) <stechew@cisco.com>
	Thu, 4 Mar 2021 18:55:08 +0000 (18:55 +0000)
commit	acccca22d9ac032b6af321b353558685aa2f5c51
tree	46e192985d1010f844475a290ca40a135ffa5042	tree
parent	9324b65441524ab55fcf2bf35ab5854ede3d5174	commit \| diff

Merge pull request #2772 in SNORT/snort3 from ~DERAMADA/snort3:ftp_held_pkt_detection to master

Squashed commit of the following:

commit 26c02c56d90d25bcbd9b8e62e1dcf0e12ca991df
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Thu Feb 25 11:04:05 2021 -0500

    stream: set block pending flag when a flow is dropped

commit dd01cd19943517c5dcada77d82c3079dd20a2c64
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Thu Feb 25 11:03:02 2021 -0500

    ftp_telnet: implement init_partial_flush for ftp data

src/service_inspectors/ftp_telnet/ftpdata_splitter.h		diff \| blob \| blame \| history
src/stream/stream.cc		diff \| blob \| blame \| history