Merge remote-tracking branch 'origin' into topic/bernhard/input-threads

This commit is contained in:
Bernhard Amann 2012-03-22 12:41:44 -07:00
commit e7f1200f9f
26 changed files with 117 additions and 277 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;