Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 09:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/intrusiveptr-warnings'

Browse source 
* origin/topic/timw/intrusiveptr-warnings:
  Fix a few more IntrusivePtr deprecation warnings
This commit is contained in:
Jon Siwek 2020-04-27 13:34:22 -07:00
commit 034b4b5ea7
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -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 3.2.0-dev.437 | 2020-04-27 19:30:24 +0000
* GH-854: provide access to original HTTP/MIME header names * GH-854: provide access to original HTTP/MIME header names

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.437 3.2.0-dev.441

4
src/analyzer/protocol/http/HTTP.cc
View file

@ -1670,8 +1670,8 @@ void HTTP_Analyzer::HTTP_Header(bool is_orig, mime::MIME_Header* h)
DEBUG_MSG("%.6f http_header\n", network_time); DEBUG_MSG("%.6f http_header\n", network_time);
EnqueueConnEvent(http_header, EnqueueConnEvent(http_header,
IntrusivePtr{AdoptRef{}, BuildConnVal()}, ConnVal(),
IntrusivePtr{AdoptRef{}, val_mgr->GetBool(is_orig)}, val_mgr->Bool(is_orig),
IntrusivePtr{AdoptRef{}, mime::new_string_val(h->get_name())}, 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_name())->ToUpper()},
IntrusivePtr{AdoptRef{}, mime::new_string_val(h->get_value())} IntrusivePtr{AdoptRef{}, mime::new_string_val(h->get_value())}

2
src/probabilistic/bloom-filter.bif
View file

@ -174,7 +174,7 @@ function bloomfilter_lookup%(bf: opaque of bloomfilter, x: any%): count
const BloomFilterVal* bfv = static_cast<const BloomFilterVal*>(bf); const BloomFilterVal* bfv = static_cast<const BloomFilterVal*>(bf);
if ( ! bfv->Type() ) if ( ! bfv->Type() )
return val_mgr->GetCount(0); return val_mgr->Count(0);
else if ( ! same_type(bfv->Type(), x->Type()) ) else if ( ! same_type(bfv->Type(), x->Type()) )
reporter->Error("incompatible Bloom filter types"); reporter->Error("incompatible Bloom filter types");