diff --git a/CHANGES b/CHANGES index f9b52f767c..1dde433bad 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +3.2.0-dev.441 | 2020-04-27 13:34:22 -0700 + + * Fix a few more IntrusivePtr deprecation warnings (Tim Wojtulewicz, Corelight) + + * Fix cloning of TypeType values (Vern Paxson, Corelight) + 3.2.0-dev.437 | 2020-04-27 19:30:24 +0000 * GH-854: provide access to original HTTP/MIME header names diff --git a/VERSION b/VERSION index 96808bcf90..f6c137868c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.437 +3.2.0-dev.441 diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index 3c27eed389..94412b110f 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -1670,8 +1670,8 @@ void HTTP_Analyzer::HTTP_Header(bool is_orig, mime::MIME_Header* h) DEBUG_MSG("%.6f http_header\n", network_time); EnqueueConnEvent(http_header, - IntrusivePtr{AdoptRef{}, BuildConnVal()}, - IntrusivePtr{AdoptRef{}, val_mgr->GetBool(is_orig)}, + ConnVal(), + val_mgr->Bool(is_orig), IntrusivePtr{AdoptRef{}, mime::new_string_val(h->get_name())}, IntrusivePtr{AdoptRef{}, mime::new_string_val(h->get_name())->ToUpper()}, IntrusivePtr{AdoptRef{}, mime::new_string_val(h->get_value())} diff --git a/src/probabilistic/bloom-filter.bif b/src/probabilistic/bloom-filter.bif index 25416c566d..fb9784658e 100644 --- a/src/probabilistic/bloom-filter.bif +++ b/src/probabilistic/bloom-filter.bif @@ -174,7 +174,7 @@ function bloomfilter_lookup%(bf: opaque of bloomfilter, x: any%): count const BloomFilterVal* bfv = static_cast(bf); if ( ! bfv->Type() ) - return val_mgr->GetCount(0); + return val_mgr->Count(0); else if ( ! same_type(bfv->Type(), x->Type()) ) reporter->Error("incompatible Bloom filter types");