You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2012/06/19 00:23:11 UTC
git commit: TS-1303: Fix backwards compatibility for port
configuration for '=6'.
Updated Branches:
refs/heads/master 9b5bb0ff6 -> 85d04a0e5
TS-1303: Fix backwards compatibility for port configuration for '=6'.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/85d04a0e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/85d04a0e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/85d04a0e
Branch: refs/heads/master
Commit: 85d04a0e58a97fc160865323f88f91f1ca948c75
Parents: 9b5bb0f
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Mon Jun 18 17:22:16 2012 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Mon Jun 18 17:22:16 2012 -0500
----------------------------------------------------------------------
CHANGES | 3 +++
lib/records/RecHttp.cc | 5 +++++
2 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/85d04a0e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 579964e..0f3d65b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.3.0
+ *) [TS-1303] Added '=6' as special case for HTTP port configuration for
+ backwards compatibility.
+
*) [TS-1301] Add a new API, TSHttpTxnMilestoneGet(), which can be used
to retrieve the various internal milestone timers from a plugin.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/85d04a0e/lib/records/RecHttp.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index f5dce11..de53661 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -314,8 +314,13 @@ HttpProxyPort::processOptions(char const* opts) {
m_type = TRANSPORT_BLIND_TUNNEL;
} else if (0 == strcasecmp("X6", item) || 0 == strcasecmp(OPT_IPV6, item)) {
m_family = AF_INET6;
+ af_set_p = true;
m_type = TRANSPORT_DEFAULT;
+ } else if (0 == strcasecmp("=6", item)) {
+ m_family = AF_INET6;
af_set_p = true;
+ m_type = TRANSPORT_DEFAULT;
+ m_inbound_transparent_p = m_outbound_transparent_p = true;
} else if (0 == strcasecmp(OPT_IPV4, item)) {
m_family = AF_INET;
af_set_p = true;