]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2527 in SNORT/snort3 from ~STECHEW/snort3:ips_infinite_loop to...
authorSteve Chew (stechew) <stechew@cisco.com>
Tue, 20 Oct 2020 20:33:48 +0000 (20:33 +0000)
committerSteve Chew (stechew) <stechew@cisco.com>
Tue, 20 Oct 2020 20:33:48 +0000 (20:33 +0000)
commitf60d667e6bb212fd8e3b3d56dffda0fcad657b63
tree7a7963cb58844ce5ab9bada2cdefedd3241eea36
parent289ae7bdbd4c8d7fd380660e207c9c128b37e9ff
Merge pull request #2527 in SNORT/snort3 from ~STECHEW/snort3:ips_infinite_loop to master

Squashed commit of the following:

commit acc6832a9d351f2376404f3be7596c29e93993f8
Author: Steve Chew <stechew@cisco.com>
Date:   Thu Oct 1 15:45:47 2020 -0400

    ips_options: Fix retry calculation in IPS content when handling "within" field.
src/detection/detection_options.cc
src/framework/ips_option.h
src/ips_options/ips_content.cc
src/ips_options/ips_pcre.cc
src/ips_options/ips_regex.cc
src/ips_options/test/ips_regex_test.cc
src/service_inspectors/http_inspect/ips_http.cc
src/service_inspectors/http_inspect/ips_http.h