You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/09/05 23:26:15 UTC
[1/4] git commit: Cppapi: small change to force refresh of cached url
Repository: trafficserver
Updated Branches:
refs/heads/master 03c193537 -> 4b0cd6a13
Cppapi: small change to force refresh of cached url
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/13e1b483
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/13e1b483
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/13e1b483
Branch: refs/heads/master
Commit: 13e1b4837c9f6145ff3a842819d2bdb338702641
Parents: ae56b90
Author: Brian Geffon <br...@apache.org>
Authored: Fri Sep 5 13:57:33 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Fri Sep 5 13:57:33 2014 -0700
----------------------------------------------------------------------
lib/atscppapi/src/utils_internal.cc | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/13e1b483/lib/atscppapi/src/utils_internal.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/atscppapi/src/utils_internal.cc
index a63b59f..460b370 100644
--- a/lib/atscppapi/src/utils_internal.cc
+++ b/lib/atscppapi/src/utils_internal.cc
@@ -105,6 +105,11 @@ void inline invokePluginForEvent(Plugin *plugin, TSHttpTxn ats_txn_handle, TSEve
break;
case TS_EVENT_HTTP_POST_REMAP:
plugin->handleReadRequestHeadersPostRemap(transaction);
+
+ // This is hear to force a refresh of the cached client request url
+ TSMBuffer hdr_buf;
+ TSMLoc hdr_loc;
+ TSHttpTxnClientReqGet(static_cast<TSHttpTxn>(transaction.getAtsHandle()), &hdr_buf, &hdr_loc);
break;
case TS_EVENT_HTTP_SEND_REQUEST_HDR:
plugin->handleSendRequestHeaders(transaction);
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4b0cd6a1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4b0cd6a1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4b0cd6a1
Branch: refs/heads/master
Commit: 4b0cd6a136e9278142772bc6b71c974d551b70df
Parents: 59edc69 03c1935
Author: Brian Geffon <br...@apache.org>
Authored: Fri Sep 5 14:25:51 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Fri Sep 5 14:25:51 2014 -0700
----------------------------------------------------------------------
doc/reference/api/TSHttpOverridableConfig.en.rst | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[2/4] git commit: Cppapi: adding small error message
Posted by br...@apache.org.
Cppapi: adding small error message
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4805426c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4805426c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4805426c
Branch: refs/heads/master
Commit: 4805426cac31d2b7d86e03d51626bf04fa436e50
Parents: 13e1b48
Author: Brian Geffon <br...@apache.org>
Authored: Fri Sep 5 14:15:17 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Fri Sep 5 14:15:17 2014 -0700
----------------------------------------------------------------------
lib/atscppapi/src/InterceptPlugin.cc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4805426c/lib/atscppapi/src/InterceptPlugin.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/InterceptPlugin.cc b/lib/atscppapi/src/InterceptPlugin.cc
index 0ae841e..c7e3f8c 100644
--- a/lib/atscppapi/src/InterceptPlugin.cc
+++ b/lib/atscppapi/src/InterceptPlugin.cc
@@ -311,6 +311,7 @@ int handleEvents(TSCont cont, TSEvent event, void *edata) {
InterceptPlugin::State *state = static_cast<InterceptPlugin::State *>(TSContDataGet(cont));
ScopedSharedMutexTryLock scopedTryLock(state->plugin_mutex_);
if (!scopedTryLock.hasLock()) {
+ LOG_ERROR("Couldn't get plugin lock. Will retry");
if (event != TS_EVENT_TIMEOUT) { // save only "non-retry" info
state->saved_event_ = event;
state->saved_edata_ = edata;
[3/4] git commit: Cppapi: Fix for crashes in intercept
Posted by br...@apache.org.
Cppapi: Fix for crashes in intercept
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/59edc697
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/59edc697
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/59edc697
Branch: refs/heads/master
Commit: 59edc697c28f123bb3578ee17e2d87f1e8d8568e
Parents: 4805426
Author: Brian Geffon <br...@apache.org>
Authored: Fri Sep 5 14:25:46 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Fri Sep 5 14:25:46 2014 -0700
----------------------------------------------------------------------
lib/atscppapi/src/InterceptPlugin.cc | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/59edc697/lib/atscppapi/src/InterceptPlugin.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/InterceptPlugin.cc b/lib/atscppapi/src/InterceptPlugin.cc
index c7e3f8c..9384fea 100644
--- a/lib/atscppapi/src/InterceptPlugin.cc
+++ b/lib/atscppapi/src/InterceptPlugin.cc
@@ -319,13 +319,16 @@ int handleEvents(TSCont cont, TSEvent event, void *edata) {
state->timeout_action_ = TSContSchedule(cont, 1, TS_THREAD_POOL_DEFAULT);
return 0;
}
+ if (event == TS_EVENT_TIMEOUT) {
+ state->timeout_action_ = NULL;
+ event = state->saved_event_; // restore saved event
+ edata = state->saved_edata_;
+ }
if (state->plugin_) {
- if (event == TS_EVENT_TIMEOUT) { // restore original event
- event = state->saved_event_;
- edata = state->saved_edata_;
- }
utils::internal::dispatchInterceptEvent(state->plugin_, event, edata);
}
+ else if (state->timeout_action_) { // we had scheduled a timeout on ourselves; let's wait for it
+ }
else { // plugin was destroyed before intercept was completed; cleaning up here
LOG_DEBUG("Cleaning up as intercept plugin is already destroyed");
destroyCont(state);
@@ -340,10 +343,6 @@ void destroyCont(InterceptPlugin::State *state) {
TSVConnClose(state->net_vc_);
state->net_vc_ = NULL;
}
- if (state->timeout_action_) {
- TSActionCancel(state->timeout_action_);
- state->timeout_action_ = NULL;
- }
TSContDestroy(state->cont_);
}