You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/04/03 21:15:47 UTC
[1/4] trafficserver git commit: TS-3491: background_fetch: Only
release URL if we were scheduled
Repository: trafficserver
Updated Branches:
refs/heads/5.3.x 3f9e5b1ef -> 7bfa66647
TS-3491: background_fetch: Only release URL if we were scheduled
(cherry picked from commit 9f33e9ef88bcab99ebc4d1d5d6d45c2c8cd986da)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4fc322a2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4fc322a2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4fc322a2
Branch: refs/heads/5.3.x
Commit: 4fc322a2f3038a4761412b12c3807049ab7d098f
Parents: 3f9e5b1
Author: John Rushford <Jo...@cable.comcast.com>
Authored: Fri Apr 3 11:35:58 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Apr 3 12:56:09 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
plugins/experimental/background_fetch/background_fetch.cc | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fc322a2/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index d3aaf02..6ab80c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3491] background_fetch: Only release URL if we were scheduled.
+
*) [TS-2709] ATS does not send close-notify on shutdown. Confuses some clients.
*) [TS-3467] Cleanup tmp files created from traffic_via tests.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4fc322a2/plugins/experimental/background_fetch/background_fetch.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index 22b23dc..06bd076 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -294,6 +294,8 @@ public:
}
TSMutexUnlock(_lock);
+ TSDebug (PLUGIN_NAME, "BGFetchConfig.acquire(): ret = %d, url = %s\n", ret, url.c_str());
+
return ret;
}
@@ -332,14 +334,16 @@ static int cont_bg_fetch(TSCont contp, TSEvent event, void *edata);
struct BGFetchData {
BGFetchData(BGFetchConfig *cfg = gConfig)
- : hdr_loc(TS_NULL_MLOC), url_loc(TS_NULL_MLOC), vc(NULL), _bytes(0), _cont(NULL), _config(cfg)
+ : hdr_loc(TS_NULL_MLOC), url_loc(TS_NULL_MLOC), vc(NULL), _bytes(0), _cont(NULL), _config(cfg), _scheduled(0)
{
mbuf = TSMBufferCreate();
}
~BGFetchData()
{
- release_url();
+ if (_scheduled) {
+ release_url();
+ }
TSHandleMLocRelease(mbuf, TS_NULL_MLOC, hdr_loc);
TSHandleMLocRelease(mbuf, TS_NULL_MLOC, url_loc);
@@ -405,6 +409,7 @@ private:
int64_t _bytes;
TSCont _cont;
BGFetchConfig *_config;
+ bool _scheduled;
};
@@ -491,6 +496,7 @@ BGFetchData::schedule()
// Schedule
TSContSchedule(_cont, 0, TS_THREAD_POOL_NET);
+ _scheduled = true;
}
[4/4] trafficserver git commit: TS-3470 traffic_server --help
segfaults when SPDY is enabled
Posted by so...@apache.org.
TS-3470 traffic_server --help segfaults when SPDY is enabled
(cherry picked from commit e0de1d6edd57130b15c1a4e8f3c2c89f2eced3cb)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7bfa6664
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7bfa6664
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7bfa6664
Branch: refs/heads/5.3.x
Commit: 7bfa66647a361d5aa370c4da719143f65abc433c
Parents: a02ee84
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Mar 31 11:17:52 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Apr 3 13:02:54 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
lib/ts/ink_args.cc | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7bfa6664/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6ab80c6..9a6c8ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.3.0
+ *) [TS-3470] traffic_server --help segfaults when SPDY is enabled.
+
*) [TS-3491] background_fetch: Only release URL if we were scheduled.
*) [TS-2709] ATS does not send close-notify on shutdown. Confuses some clients.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7bfa6664/lib/ts/ink_args.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 12ab5c0..91cebd8 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -323,5 +323,5 @@ usage(const ArgumentDescription *argument_descriptions, unsigned n_argument_desc
}
fprintf(stderr, " %s\n", argument_descriptions[i].description);
}
- exit(EX_USAGE);
+ _exit(EX_USAGE);
}
[2/4] trafficserver git commit: TS-3491: background_fetch: We don't
need the extra variable. We can tell if we were scheduled from the _cont.
Posted by so...@apache.org.
TS-3491: background_fetch: We don't need the extra variable. We can
tell if we were scheduled from the _cont.
(cherry picked from commit 6fbe03ad1b110640faa4f39ef26b1657c4ee19b7)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/56013a63
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/56013a63
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/56013a63
Branch: refs/heads/5.3.x
Commit: 56013a631b5165dabc7d8efef9c4761f858cd513
Parents: 4fc322a
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Apr 3 11:40:55 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Apr 3 12:56:15 2015 -0600
----------------------------------------------------------------------
.../experimental/background_fetch/background_fetch.cc | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56013a63/plugins/experimental/background_fetch/background_fetch.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index 06bd076..964624e 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -334,16 +334,13 @@ static int cont_bg_fetch(TSCont contp, TSEvent event, void *edata);
struct BGFetchData {
BGFetchData(BGFetchConfig *cfg = gConfig)
- : hdr_loc(TS_NULL_MLOC), url_loc(TS_NULL_MLOC), vc(NULL), _bytes(0), _cont(NULL), _config(cfg), _scheduled(0)
+ : hdr_loc(TS_NULL_MLOC), url_loc(TS_NULL_MLOC), vc(NULL), _bytes(0), _cont(NULL), _config(cfg)
{
mbuf = TSMBufferCreate();
}
~BGFetchData()
{
- if (_scheduled) {
- release_url();
- }
TSHandleMLocRelease(mbuf, TS_NULL_MLOC, hdr_loc);
TSHandleMLocRelease(mbuf, TS_NULL_MLOC, url_loc);
@@ -358,8 +355,10 @@ struct BGFetchData {
// If we got schedule, also clean that up
if (_cont) {
- TSContDestroy(_cont);
+ release_url();
+ TSContDestroy(_cont);
+ _cont = NULL;
TSIOBufferReaderFree(req_io_buf_reader);
TSIOBufferDestroy(req_io_buf);
TSIOBufferReaderFree(resp_io_buf_reader);
@@ -409,7 +408,6 @@ private:
int64_t _bytes;
TSCont _cont;
BGFetchConfig *_config;
- bool _scheduled;
};
@@ -496,7 +494,6 @@ BGFetchData::schedule()
// Schedule
TSContSchedule(_cont, 0, TS_THREAD_POOL_NET);
- _scheduled = true;
}
[3/4] trafficserver git commit: TS-3491: clang-format
Posted by so...@apache.org.
TS-3491: clang-format
(cherry picked from commit e407f9d44c998e9c58bbdb9f822813482098a32d)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a02ee843
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a02ee843
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a02ee843
Branch: refs/heads/5.3.x
Commit: a02ee8438b7efaf35b636cd2c94d6e6501bda20c
Parents: 56013a6
Author: Phil Sorber <so...@apache.org>
Authored: Fri Apr 3 11:47:13 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Apr 3 12:56:59 2015 -0600
----------------------------------------------------------------------
plugins/experimental/background_fetch/background_fetch.cc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a02ee843/plugins/experimental/background_fetch/background_fetch.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index 964624e..6c22cf6 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -294,7 +294,7 @@ public:
}
TSMutexUnlock(_lock);
- TSDebug (PLUGIN_NAME, "BGFetchConfig.acquire(): ret = %d, url = %s\n", ret, url.c_str());
+ TSDebug(PLUGIN_NAME, "BGFetchConfig.acquire(): ret = %d, url = %s\n", ret, url.c_str());
return ret;
}
@@ -341,7 +341,6 @@ struct BGFetchData {
~BGFetchData()
{
-
TSHandleMLocRelease(mbuf, TS_NULL_MLOC, hdr_loc);
TSHandleMLocRelease(mbuf, TS_NULL_MLOC, url_loc);