You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/06/13 02:01:24 UTC
[1/2] trafficserver git commit: [TS-3455]: Fix debug assert in parent
proxy scenario
Repository: trafficserver
Updated Branches:
refs/heads/master fc2de7004 -> a6fbcc1f0
[TS-3455]: Fix debug assert in parent proxy scenario
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7403eacc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7403eacc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7403eacc
Branch: refs/heads/master
Commit: 7403eaccdf94c76e7ec1177022b535f8569f3a26
Parents: fc2de70
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Jun 13 00:00:27 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Sat Jun 13 00:00:27 2015 +0000
----------------------------------------------------------------------
proxy/http/HttpTransact.cc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7403eacc/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 21eb935..240be27 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -388,7 +388,7 @@ does_method_effect_cache(int method)
inline static HttpTransact::StateMachineAction_t
how_to_open_connection(HttpTransact::State *s)
{
- ink_assert(s->pending_work == NULL);
+ ink_assert((s->pending_work == NULL) || (s->current.request_to == PARENT_PROXY));
// Originally we returned which type of server to open
// Now, however, we may want to issue a cache
@@ -2689,11 +2689,6 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
// ink_release_assert(s->current.request_to == PARENT_PROXY ||
// s->http_config_param->no_dns_forward_to_parent != 0);
- // Set ourselves up to handle pending revalidate issues
- // after the PP DNS lookup
- ink_assert(s->pending_work == NULL);
- s->pending_work = issue_revalidate;
-
// We must be going a PARENT PROXY since so did
// origin server DNS lookup right after state Start
//
@@ -2702,6 +2697,11 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
// missing ip but we won't take down the system
//
if (s->current.request_to == PARENT_PROXY) {
+ // Set ourselves up to handle pending revalidate issues
+ // after the PP DNS lookup
+ ink_assert(s->pending_work == NULL);
+ s->pending_work = issue_revalidate;
+
TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, PPDNSLookup);
} else if (s->current.request_to == ORIGIN_SERVER) {
TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, OSDNSLookup);
[2/2] trafficserver git commit: [TS-3455]: update CHANGES
Posted by su...@apache.org.
[TS-3455]: update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a6fbcc1f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a6fbcc1f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a6fbcc1f
Branch: refs/heads/master
Commit: a6fbcc1f0bc7ad086dd0c667459e1edec8410cfe
Parents: 7403eac
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Sat Jun 13 00:01:04 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Sat Jun 13 00:01:04 2015 +0000
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a6fbcc1f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8b5073b..e6720b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3455]: Fix debug assert in parent proxy scenario.
+
*) [TS-3126]: Remove the config setting that controls sending of HTTP status
response (408) on a POST failure (e.g timeout) and make the sending of 408
default.