Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/robin/pktsrc

Browse source
This commit is contained in:
Robin Sommer 2014-09-08 14:02:49 -07:00
commit 265438b84c
6 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.3-136 | 2014-09-07 20:50:46 -0700
* Change more http links to https. (Johanna Amann)
2.3-134 | 2014-09-04 16:16:36 -0700 2.3-134 | 2014-09-04 16:16:36 -0700
* Fixed a number of issues with OCSP reply validation. Addresses * Fixed a number of issues with OCSP reply validation. Addresses

2
NEWS
View file

@ -22,7 +22,7 @@ New Functionality
plugin can furthermore hook into Bro's processing a number of places plugin can furthermore hook into Bro's processing a number of places
to add custom logic. to add custom logic.
See http://www.bro.org/sphinx-git/devel/plugins.html for more See https://www.bro.org/sphinx-git/devel/plugins.html for more
information on writing plugins. information on writing plugins.
Changed Functionality Changed Functionality

2
VERSION
View file

@ -1 +1 @@
2.3-134 2.3-136

2
doc/install/install.rst
View file

@ -180,7 +180,7 @@ automatically. Finally, use ``make install-aux`` to install some of
the other programs that are in the ``aux/bro-aux`` directory. the other programs that are in the ``aux/bro-aux`` directory.
OpenBSD users, please see our `FAQ OpenBSD users, please see our `FAQ
<http://www.bro.org/documentation/faq.html>`_ if you are having <//www.bro.org/documentation/faq.html>`_ if you are having
problems installing Bro. problems installing Bro.
Finally, if you want to build the Bro documentation (not required, because Finally, if you want to build the Bro documentation (not required, because

2
doc/quickstart/index.rst
View file

@ -1,5 +1,5 @@
.. _FAQ: http://www.bro.org/documentation/faq.html .. _FAQ: //www.bro.org/documentation/faq.html
.. _quickstart: .. _quickstart:

2
src/iosource/pcap/Source.h
View file

@ -10,9 +10,7 @@ namespace pcap {
class PcapSource : public iosource::PktSrc { class PcapSource : public iosource::PktSrc {
public: public:
// XXX
PcapSource(const std::string& path, bool is_live); PcapSource(const std::string& path, bool is_live);
virtual ~PcapSource(); virtual ~PcapSource();
static PktSrc* Instantiate(const std::string& path, bool is_live); static PktSrc* Instantiate(const std::string& path, bool is_live);