Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix uninitialized DPM member.
This commit is contained in:
Robin Sommer 2013-05-17 13:37:16 -07:00
commit 4a235f7bbb
3 changed files with 11 additions and 2 deletions

View file

@ -1,4 +1,13 @@
2.1-651 | 2013-05-17 13:37:16 -0700
* Fix uninitialized DPM member. (Jon Siwek)
* Fix issue with transaction ID reuse in a single DNS connection. (Seth Hall)
* New function added to the queue.bro script to support peeking at
the new gettable item in the queue without removing it. (Seth Hall)
2.1-647 | 2013-05-17 07:47:14 -0700 2.1-647 | 2013-05-17 07:47:14 -0700
* Fixing Broxygen generation to have BROMAGIC set. (Robin Sommer) * Fixing Broxygen generation to have BROMAGIC set. (Robin Sommer)

View file

@ -1 +1 @@
2.1-647 2.1-651

View file

@ -34,7 +34,7 @@ ExpectedConn::ExpectedConn(const ExpectedConn& c)
} }
DPM::DPM() DPM::DPM()
: expected_conns_queue(AssignedAnalyzer::compare) : active_analyzers(0), expected_conns_queue(AssignedAnalyzer::compare)
{ {
} }