From 310d79b8f14bb76393c6abedae9d64cc8e4f711d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 14 Aug 2015 23:29:31 +0200 Subject: [PATCH] Adding special variable 'lastPage' to the eval code (by request from ML) --- lib/core/threads.py | 1 + lib/request/connect.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/core/threads.py b/lib/core/threads.py index 8647ecfd0..7a1f8d0f3 100644 --- a/lib/core/threads.py +++ b/lib/core/threads.py @@ -47,6 +47,7 @@ class _ThreadData(threading.local): self.lastHTTPError = None self.lastRedirectMsg = None self.lastQueryDuration = 0 + self.lastPage = None self.lastRequestMsg = None self.lastRequestUID = 0 self.lastRedirectURL = None diff --git a/lib/request/connect.py b/lib/request/connect.py index 8914e6cb0..26039a92f 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -889,7 +889,7 @@ class Connect(object): if conf.evalCode: delimiter = conf.paramDel or DEFAULT_GET_POST_DELIMITER - variables = {"uri": uri} + variables = {"uri": uri, "lastPage": threadData.lastPage} originals = {} keywords = keyword.kwlist @@ -1064,6 +1064,7 @@ class Connect(object): page, headers, code = Connect.getPage(url=conf.secondOrder, cookie=cookie, ua=ua, silent=silent, auxHeaders=auxHeaders, response=response, raise404=False, ignoreTimeout=timeBasedCompare, refreshing=True) threadData.lastQueryDuration = calculateDeltaSeconds(start) + threadData.lastPage = page kb.originalCode = kb.originalCode or code