diff --git a/patator.py b/patator.py index 3beeab3..cdb791e 100755 --- a/patator.py +++ b/patator.py @@ -2972,14 +2972,14 @@ except ImportError: class Response_HTTP(Response_Base): - indicatorsfmt= [('code', -4), ('size:clen', -13), ('time', 6)] + indicatorsfmt = [('code', -4), ('size:clen', -13), ('time', 9)] - def __init__(self, code, response, trace, content_length, time): - Response_Base.__init__(self, code, response, time, trace=trace) + def __init__(self, code, response, timing=0, trace=None, content_length=-1): + Response_Base.__init__(self, code, response, timing, trace=trace) self.content_length = content_length def indicators(self): - return self.code, '%d:%d' % (self.size, self.content_length), '%.3f' % self.time + return self.code, '%d:%d' % (self.size, self.content_length), '%.6f' % self.time def __str__(self): lines = re.findall('^(HTTP/.+)$', self.mesg, re.M) @@ -3169,7 +3169,7 @@ class HTTP_fuzz(TCP_Cache): if persistent == '0': self.reset() - return self.Response(http_code, response.getvalue(), trace.getvalue(), content_length, response_time) + return self.Response(http_code, response.getvalue(), response_time, trace.getvalue(), content_length) # }}}