Merge branch 'master' into topic/jsiwek/ipv6-ext-headers

This commit is contained in:
Jon Siwek 2012-03-19 14:26:59 -05:00
commit f11fca588e
17 changed files with 99 additions and 19 deletions

View file

@ -275,7 +275,7 @@ event ftp_reply(c: connection, code: count, msg: string, cont_resp: bool) &prior
{
c$ftp$passive=T;
if ( code == 229 && data$h == :: )
if ( code == 229 && data$h == [::] )
data$h = id$resp_h;
ftp_data_expected[data$h, data$p] = c$ftp;