You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/05/20 21:53:22 UTC
[1/2] trafficserver git commit: TS-3615 Move the validity assertion
to the correct place
Repository: trafficserver
Updated Branches:
refs/heads/master 1dfd8c240 -> 5592ed98e
TS-3615 Move the validity assertion to the correct place
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/63c3d219
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/63c3d219
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/63c3d219
Branch: refs/heads/master
Commit: 63c3d219909c5a797f303a0e87f36dc1af789b19
Parents: 1dfd8c2
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon May 18 07:16:39 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed May 20 13:52:20 2015 -0600
----------------------------------------------------------------------
plugins/experimental/s3_auth/s3_auth.cc | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63c3d219/plugins/experimental/s3_auth/s3_auth.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/experimental/s3_auth/s3_auth.cc
index e59621d..aec74f3 100644
--- a/plugins/experimental/s3_auth/s3_auth.cc
+++ b/plugins/experimental/s3_auth/s3_auth.cc
@@ -535,8 +535,8 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo * /* rri */)
{
S3Config *s3 = static_cast<S3Config *>(ih);
- TSAssert(s3->valid());
if (s3) {
+ TSAssert(s3->valid());
// Now schedule the continuation to update the URL when going to origin.
// Note that in most cases, this is a No-Op, assuming you have reasonable
// cache hit ratio. However, the scheduling is next to free (very cheap).
@@ -552,19 +552,3 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo * /* rri */)
// This plugin actually doesn't do anything with remapping. Ever.
return TSREMAP_NO_REMAP;
}
-
-
-/*
- local variables:
- mode: C++
- indent-tabs-mode: nil
- c-basic-offset: 2
- c-comment-only-line-offset: 0
- c-file-offsets: ((statement-block-intro . +)
- (label . 0)
- (statement-cont . +)
- (innamespace . 0))
- end:
-
- Indent with: /usr/bin/indent -ncs -nut -npcs -l 120 logstats.cc
-*/
[2/2] trafficserver git commit: Added TS-3615
Posted by zw...@apache.org.
Added TS-3615
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5592ed98
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5592ed98
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5592ed98
Branch: refs/heads/master
Commit: 5592ed98e21be8ab6dc431f680667e304621091c
Parents: 63c3d21
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed May 20 13:52:57 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed May 20 13:52:57 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5592ed98/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1fd1ee1..e176db4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3615] s3_auth: move the validity assertion to the correct place.
+
*) [TS-3616] Eliminate BUILD_HAVE_LIBCXX.
*) [TS-3622] Add a bound to read_while_writer retries with a config