Updated Branches: refs/heads/master 22bd64a66 -> 2e8ae19cd
TS-1340: Document the common use-case of standard IPv4 and IPv4 ports Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2e8ae19c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2e8ae19c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2e8ae19c Branch: refs/heads/master Commit: 2e8ae19cde93146719bc5647b1709f912fbcaa35 Parents: 22bd64a Author: Jan-Frode Myklebust <[email protected]> Authored: Sat Jul 21 17:16:32 2012 -0700 Committer: James Peach <[email protected]> Committed: Sat Jul 21 17:16:32 2012 -0700 ---------------------------------------------------------------------- CHANGES | 3 +++ proxy/config/records.config.default.in | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e8ae19c/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index ef84798..061fa45 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.0 + *) [TS-1340] Improve IPv6 port example in records.comfig + Author: Jan-Frode Myklebust + *) [TS-1363] Cert path not working using intermdiate certificate *) [TS-895] Added version checks for bison and flex. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e8ae19c/proxy/config/records.config.default.in ---------------------------------------------------------------------- diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in index 4fa439a..2c2911b 100644 --- a/proxy/config/records.config.default.in +++ b/proxy/config/records.config.default.in @@ -97,8 +97,12 @@ CONFIG proxy.config.alarm.abs_path STRING NULL # ip-out can be repeated as long as each address is a different family. # The '=' is optional. # - # Example: Port 8080 IPv6 inbound transparent, and port 80 IPv4 + # Example 1: Port 8080 IPv6 inbound transparent, and port 80 IPv4 # "8080:ipv6:tr-in 80" + # + # Example 2: Listen on standard http and https ports for IPv4 and IPv6: + # "80:ipv4 80:ipv6 443:ipv4:ssl 443:ipv6:ssl" + # CONFIG proxy.config.http.server_ports STRING 8080 # Ports on the origin server to which a blind tunnel may connect. CONFIG proxy.config.http.connect_ports STRING 443 563
