------------------------------------------------------------
revno: 12962
revision-id: squid3@treenet.co.nz-20130726052129-1bxet953e3apkw6v
parent: squid3@treenet.co.nz-20130726020625-l8l0clkpkt208om0
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Thu 2013-07-25 23:21:29 -0600
message:
  Docs: Update http(s)_port protocol= details
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130726052129-1bxet953e3apkw6v
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: d7bac26ef3ede930327a39e46972465e3449dc3a
# timestamp: 2013-07-26 05:57:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20130726020625-\
#   l8l0clkpkt208om0
# 
# Begin patch
=== modified file 'src/cf.data.pre'
--- src/cf.data.pre	2013-07-21 19:24:35 +0000
+++ src/cf.data.pre	2013-07-26 05:21:29 +0000
@@ -1627,9 +1627,12 @@
 
 	   no-vhost	Disable using HTTP/1.1 Host header for virtual domain support.
 
-	   protocol=	Protocol to reconstruct accelerated requests with.
-			Defaults to http for http_port and https for
-			https_port
+	   protocol=	Protocol to reconstruct accelerated and intercepted
+			requests with. Defaults to HTTP/1.1 for http_port and
+			HTTPS/1.1 for https_port.
+			When an unsupported value is configured Squid will
+			produce a FATAL error.
+			Values: HTTP or HTTP/1.1, HTTPS or HTTPS/1.1
 
 	   vport	Virtual host port support. Using the http_port number
 			instead of the port passed on Host: headers.