upmerge 12916194

This commit is contained in:
Bjorn Munch 2011-09-19 16:11:15 +02:00
commit fe4f15f02d

View file

@ -4196,6 +4196,11 @@ sub extract_server_log ($$) {
else
{
push(@lines, $line);
if (scalar(@lines) > 1000000) {
$Ferr = undef;
mtr_warning("Too much log from test, bailing out from extracting");
return ();
}
}
}
else