Repository: trafficserver Updated Branches: refs/heads/master 1fec97e14 -> f84bfd814
TS-2558 - remove inbound transparent vs. ssl check. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f84bfd81 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f84bfd81 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f84bfd81 Branch: refs/heads/master Commit: f84bfd8147ced353ee7122650eab1d3b070efd0a Parents: 1fec97e Author: Alan M. Carroll <[email protected]> Authored: Mon May 19 18:08:27 2014 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Mon May 19 18:08:27 2014 -0500 ---------------------------------------------------------------------- CHANGES | 2 ++ doc/reference/configuration/records.config.en.rst | 6 +++--- lib/records/RecHttp.cc | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f84bfd81/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index bd2d37c..f639d8d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2558] Remove check for inbound transparency vs. SSL. + *) [TS-2810] Add the TSVConnFdCreate API. *) [TS-2342] Problem with cache.cache_responses_to_cookies value 0. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f84bfd81/doc/reference/configuration/records.config.en.rst ---------------------------------------------------------------------- diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst index c81cd6e..7a9a05a 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -477,7 +477,7 @@ ipv6 tr-in Inbound transparent. The proxy port will accept connections to any IP address on the port. To have IPv6 inbound transparent you must use this and the ``ipv6`` option. This overrides :ts:cv:`proxy.local.incoming_ip_to_bind` for this port. - Not compatible with: ``ip-in``, ``ssl``, ``blind`` + Not compatible with: ``ip-in``, ``blind`` tr-out Outbound transparent. If ATS connects to an origin server for a transaction on this port, it will use the client's address as its local address. This overrides :ts:cv:`proxy.local.outgoing_ip_to_bind` for this port. @@ -507,12 +507,12 @@ ip-out ip-resolve Set the :ts:cv:`host resolution style <proxy.config.hostdb.ip_resolve>` for transactions on this proxy port. - Not compatible with: ``tr-out``. + Not compatible with: ``tr-out`` - this option requires a value of ``client;none`` which is forced and should not be explicitly specified. ssl Require SSL termination for inbound connections. SSL :ref:`must be configured <configuring-ssl-termination>` for this option to provide a functional server port. - Not compatible with: ``tr-in``, ``blind``. + Not compatible with: ``blind``. blind Accept only ``CONNECT`` transactions on this port. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f84bfd81/lib/records/RecHttp.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc index 83e8d93..f79ff8a 100644 --- a/lib/records/RecHttp.cc +++ b/lib/records/RecHttp.cc @@ -331,12 +331,6 @@ HttpProxyPort::processOptions(char const* opts) { m_host_res_preference[1] = HOST_RES_PREFER_NONE; } - // Can't be inbound transparent and SSL. - if (TRANSPORT_SSL == m_type && m_inbound_transparent_p) { - Warning("SSL and inbound transparency on the same port is not supported - transparency disabled: '%s'", opts); - m_inbound_transparent_p = false; - } - // Transparent pass-through requires tr-in if (m_transparent_passthrough && !m_inbound_transparent_p) { Warning("Port descriptor '%s' has transparent pass-through enabled without inbound transparency, this will be ignored.", opts);
