This is an automated email from the ASF dual-hosted git repository. sorber pushed a commit to branch 6.2.x in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 63c0f147ff73b4545ba471e0082bc7988803b641 Author: James Peach <jpe...@apache.org> AuthorDate: Tue May 24 10:43:21 2016 -0700 TS-4473: Reset txnp after restoring the deferred event. (cherry picked from commit 53ab967ba6618227bda103088ba0dbdaf59eb242) --- proxy/InkAPITest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc index a9852ed..68ff2cc 100644 --- a/proxy/InkAPITest.cc +++ b/proxy/InkAPITest.cc @@ -6020,7 +6020,6 @@ static int parent_proxy_handler(TSCont contp, TSEvent event, void *edata) { ParentTest *ptest = NULL; - TSHttpTxn txnp = (TSHttpTxn)edata; CHECK_SPURIOUS_EVENT(contp, event, edata); ptest = (ParentTest *)TSContDataGet(contp); @@ -6033,6 +6032,8 @@ parent_proxy_handler(TSCont contp, TSEvent event, void *edata) ptest->deferred.edata = NULL; } + TSHttpTxn txnp = (TSHttpTxn)edata; + switch (event) { case TS_EVENT_HTTP_READ_REQUEST_HDR: // Keep deferring the test start until the parent configuration -- To stop receiving notification emails like this one, please contact "commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.