You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2019/09/25 13:43:02 UTC
[trafficserver] 02/05: Fix reference to SMDebug.
This is an automated email from the ASF dual-hosted git repository.
amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit a743ac31c4bc47efcc4cdad9b4878656b3a34f47
Author: David Calavera <da...@gmail.com>
AuthorDate: Wed Aug 14 09:42:16 2019 -0700
Fix reference to SMDebug.
Signed-off-by: David Calavera <da...@gmail.com>
---
proxy/http/HttpSM.cc | 5 +++--
src/traffic_server/InkAPI.cc | 18 ++++++++----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index e9398c7..f1df885 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1512,7 +1512,7 @@ plugins required to work with sni_routing.
api_next = API_RETURN_DEFERED_SERVER_ERROR;
break;
case HTTP_API_REWIND_STATE_MACHINE:
- DebugSM("http", "REWIND");
+ SMDebug("http", "REWIND");
callout_state = HTTP_API_NO_CALLOUT;
set_next_state();
return 0;
@@ -8033,7 +8033,8 @@ HttpSM::find_proto_string(HTTPVersion version) const
}
void
-HttpSM::rewind_state_machine() {
+HttpSM::rewind_state_machine()
+{
callout_state = HTTP_API_REWIND_STATE_MACHINE;
}
diff --git a/src/traffic_server/InkAPI.cc b/src/traffic_server/InkAPI.cc
index 88389cd..2833042 100644
--- a/src/traffic_server/InkAPI.cc
+++ b/src/traffic_server/InkAPI.cc
@@ -9790,14 +9790,13 @@ TSRegisterProtocolTag(const char *tag)
}
void
-TSHttpTxnRedoCacheLookup(TSHttpTxn txnp, const char * host, const int port,
- const char * path, const char * query)
+TSHttpTxnRedoCacheLookup(TSHttpTxn txnp, const char *host, const int port, const char *path, const char *query)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
- HttpTransact::State * s = &(sm->t_state);
+ HttpSM *sm = (HttpSM *)txnp;
+ HttpTransact::State *s = &(sm->t_state);
sdk_assert(s->next_action == HttpTransact::SM_ACTION_CACHE_LOOKUP);
- s->transact_return_point = nullptr;
+ s->transact_return_point = nullptr;
sm->rewind_state_machine();
@@ -9807,24 +9806,24 @@ TSHttpTxnRedoCacheLookup(TSHttpTxn txnp, const char * host, const int port,
TSHttpTxnClientReqGet(txnp, &buffer, &location);
TSHttpHdrUrlGet(buffer, location, &location2);
- //host
+ // host
if (nullptr != host) {
const int length = strlen(host);
TSUrlHostSet(buffer, location2, host, length);
}
- //port
+ // port
if (0 < port) {
TSUrlPortSet(buffer, location2, port);
}
- //path
+ // path
if (nullptr != path) {
const int length = strlen(path);
TSUrlPathSet(buffer, location2, path, length);
}
- //query
+ // query
if (nullptr != query) {
const int length = strlen(query);
TSUrlHttpQuerySet(buffer, location2, query, length);
@@ -9834,7 +9833,6 @@ TSHttpTxnRedoCacheLookup(TSHttpTxn txnp, const char * host, const int port,
TSHandleMLocRelease(buffer, TS_NULL_MLOC, location);
}
-
namespace
{
// Function that contains the common logic for TSRemapFrom/ToUrlGet().