From 1ad7e9152736251203cd9c57c6af3e19a2f7ad8a Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 10 Feb 2012 15:31:45 +1300 Subject: Make filter matching act more sensibly. --- libmproxy/flow.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 2499db4e..2b371180 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -932,12 +932,14 @@ class Flow: if matched, False if not. """ if f: - if self.response: - return f(self.response) - elif self.request: - return f(self.request) - elif self.error: - return f(self.error) + if self.response and f(self.response): + return True + elif self.request and f(self.request): + return True + elif self.error and f(self.error): + return True + else: + return False else: return True -- cgit v1.2.3