trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject git commit: TS-1907 - prevent "ipv6" option from breaking "ssl" option.
Date Tue, 04 Jun 2013 16:04:23 GMT
Updated Branches:
  refs/heads/master 986b254f2 -> e5a049114


TS-1907 - prevent "ipv6" option from breaking "ssl" option.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e5a04911
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e5a04911
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e5a04911

Branch: refs/heads/master
Commit: e5a049114356d03479e44ef367733e8603f27266
Parents: 986b254
Author: Alan M. Carroll <amc@network-geographics.com>
Authored: Tue Jun 4 11:03:55 2013 -0500
Committer: Alan M. Carroll <amc@network-geographics.com>
Committed: Tue Jun 4 11:03:55 2013 -0500

----------------------------------------------------------------------
 CHANGES                |    1 +
 lib/records/RecHttp.cc |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e5a04911/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 12feab4..0ddd9af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
                                                          -*- coding: utf-8 -*-
   Changes with Apache Traffic Server 3.3.3
 
+  *) [TS-1907] Using the "ipv6" option for port configuration cancels the "ssl" option.
 
   *) [TS-1927] Make ats_base64_decode able to handle the URL variant
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e5a04911/lib/records/RecHttp.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index 945a1c5..a9e32b4 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -321,11 +321,9 @@ HttpProxyPort::processOptions(char const* opts) {
     } 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;


Mime
View raw message