Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
into ts-4160
Conflicts:
lib/atscppapi/src/Transaction.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4b07507b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4b07507b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4b07507b
Branch: refs/heads/ts-4160
Commit: 4b07507b29d22e65cc0487d430fcdc9f894255fd
Parents: d5c674c 39be80d
Author: Sudheer Vinukonda <[email protected]>
Authored: Mon Feb 1 17:45:17 2016 +0000
Committer: Sudheer Vinukonda <[email protected]>
Committed: Mon Feb 1 17:45:17 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Request.cc | 15 +++-
lib/atscppapi/src/Response.cc | 13 ++++
lib/atscppapi/src/Transaction.cc | 78 +++++++--------------
lib/atscppapi/src/include/atscppapi/Request.h | 1 +
lib/atscppapi/src/include/atscppapi/Response.h | 1 +
5 files changed, 51 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b07507b/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --cc lib/atscppapi/src/Transaction.cc
index 8828c42,1f7cd22..29ace6c
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@@ -452,64 -428,49 +428,58 @@@ private
} // anonymous namespace
void
-Transaction::initServerRequest()
+Transaction::initServerRequest(TSEvent event)
{
static initializeHandles
initializeServerRequestHandles(TSHttpTxnServerReqGet);
- if (initializeServerRequestHandles(state_->txn_,
state_->server_request_hdr_buf_, state_->server_request_hdr_loc_,
- "server request")) {
- LOG_DEBUG("Initializing server request, event %d", event);
- state_->server_request_.init(state_->server_request_hdr_buf_,
state_->server_request_hdr_loc_);
- }
+ initializeServerRequestHandles(state_->txn_,
state_->server_request_hdr_buf_, state_->server_request_hdr_loc_, "server
request");
- LOG_DEBUG("Initializing server request");
++ LOG_DEBUG("Initializing server request, event %d", event);
+ state_->server_request_.init(state_->server_request_hdr_buf_,
state_->server_request_hdr_loc_);
}
void
-Transaction::initServerResponse()
+Transaction::initServerResponse(TSEvent event)
{
static initializeHandles
initializeServerResponseHandles(TSHttpTxnServerRespGet);
- if (initializeServerResponseHandles(state_->txn_,
state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
- "server response")) {
- LOG_DEBUG("Initializing server response, event %d", event);
- state_->server_response_.init(state_->server_response_hdr_buf_,
state_->server_response_hdr_loc_);
- }
+ initializeServerResponseHandles(state_->txn_,
state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
+ "server response");
- LOG_DEBUG("Initializing server response");
++ LOG_DEBUG("Initializing server response, event %d", event);
+ state_->server_response_.init(state_->server_response_hdr_buf_,
state_->server_response_hdr_loc_);
}
void
-Transaction::initClientResponse()
+Transaction::initClientResponse(TSEvent event)
{
static initializeHandles
initializeClientResponseHandles(TSHttpTxnClientRespGet);
- if (initializeClientResponseHandles(state_->txn_,
state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
- "client response")) {
- LOG_DEBUG("Initializing client response, event %d", event);
- state_->client_response_.init(state_->client_response_hdr_buf_,
state_->client_response_hdr_loc_);
- }
+ initializeClientResponseHandles(state_->txn_,
state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
+ "client response");
- LOG_DEBUG("Initializing client response");
++ LOG_DEBUG("Initializing client response, event %d", event);
+ state_->client_response_.init(state_->client_response_hdr_buf_,
state_->client_response_hdr_loc_);
}
void
-Transaction::initCachedRequest()
+Transaction::initCachedRequest(TSEvent event)
{
static initializeHandles
initializeCachedRequestHandles(TSHttpTxnCachedReqGet);
+
+ if (event == TS_EVENT_HTTP_TXN_CLOSE) {
+ // CachedRequest is destroyed in tunnel_handler_cache_read
+ state_->cached_request_.reset();
+ LOG_DEBUG("Reset cached request, event %d", event);
+ return;
+ }
+
- if (initializeCachedRequestHandles(state_->txn_,
state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_,
- "cached request")) {
- LOG_DEBUG("Initializing cached request, event %d", event);
- state_->cached_request_.init(state_->cached_request_hdr_buf_,
state_->cached_request_hdr_loc_);
- }
+ initializeCachedRequestHandles(state_->txn_,
state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_, "cached
request");
- LOG_DEBUG("Initializing cached request");
++ LOG_DEBUG("Initializing cached request, event %d", event);
+ state_->cached_request_.init(state_->cached_request_hdr_buf_,
state_->cached_request_hdr_loc_);
}
void
-Transaction::initCachedResponse()
+Transaction::initCachedResponse(TSEvent event)
{
static initializeHandles
initializeCachedResponseHandles(TSHttpTxnCachedRespGet);
- if (initializeCachedResponseHandles(state_->txn_,
state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
- "cached response")) {
- LOG_DEBUG("Initializing cached response, event %d", event);
- state_->cached_response_.init(state_->cached_response_hdr_buf_,
state_->cached_response_hdr_loc_);
- }
+ initializeCachedResponseHandles(state_->txn_,
state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
+ "cached response");
+ LOG_DEBUG("Initializing cached response");
++ LOG_DEBUG("Initializing cached response, event %d", event);
+ state_->cached_response_.init(state_->cached_response_hdr_buf_,
state_->cached_response_hdr_loc_);
}
