TS-2507: fix the state transition logging for handle_server_setup_error STATE_ENTER should take a VC event code, not a HttpApiState_t. Also, STATE_ENTER is conventionally called on entry to the state handler, not somewhere in the middle.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6af333d3 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6af333d3 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6af333d3 Branch: refs/heads/5.0.x Commit: 6af333d39e1445caeff809440b3da0e08023801e Parents: 9ad1438 Author: James Peach <[email protected]> Authored: Thu Jan 16 10:39:00 2014 -0800 Committer: James Peach <[email protected]> Committed: Fri Jan 17 11:23:29 2014 -0800 ---------------------------------------------------------------------- CHANGES | 2 ++ proxy/http/HttpSM.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6af333d3/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8929fbd..a0d6ffd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [TS-2507] Fix the state transition logging in HttpSM::handle_server_setup_error. + *) [TS-1648] Segmentation fault in dir_clear_range() *) [TS-2500] Fix handling of cache stripe assignment when a disk is http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6af333d3/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 2d6324a..5b1b855 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -5038,6 +5038,8 @@ HttpSM::handle_server_setup_error(int event, void *data) VIO *vio = (VIO *) data; ink_assert(vio != NULL); + STATE_ENTER(&HttpSM::handle_server_setup_error, event); + // If there is POST or PUT tunnel wait for the tunnel // to figure out that things have gone to hell @@ -5118,8 +5120,6 @@ HttpSM::handle_server_setup_error(int event, void *data) server_entry = NULL; server_session = NULL; - STATE_ENTER(&HttpSM::handle_server_setup_error, callout_state); - // if we are waiting on a plugin callout for // HTTP_API_SEND_REQUEST_HDR defer calling transact until // after we've finished processing the plugin callout
