Merge remote-tracking branch 'origin/master' into topic/bernhard/heartbeat

This commit is contained in:
Bernhard Amann 2014-04-18 14:26:13 -07:00
commit a92ff71e19
17 changed files with 262 additions and 105 deletions

View file

@ -136,8 +136,10 @@ function finish(c: connection, remove_analyzer: bool)
{
log_record(c$ssl);
if ( remove_analyzer && disable_analyzer_after_detection && c?$ssl && c$ssl?$analyzer_id )
{
disable_analyzer(c$id, c$ssl$analyzer_id);
delete c$ssl$analyzer_id;
}
}
event ssl_client_hello(c: connection, version: count, possible_ts: time, client_random: string, session_id: string, ciphers: index_vec) &priority=5