From 29503899f41f4adc312f1909fcf33bdc19bb4db5 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 7 Jan 2017 04:09:29 +1300
Subject: [PATCH] Make CONNECT ACL a built-in default

This really should have been done earlier when the other fixed-value ACLs were made built-in
---
 doc/release-notes/release-5.sgml | 3 ++-
 src/cf.data.pre                  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 818f637cbe..58e6122bf5 100644
--- a/doc/release-notes/release-5.sgml
+++ b/doc/release-notes/release-5.sgml
@@ -85,7 +85,8 @@ This section gives a thorough account of those changes in three categories:
 <sect1>Changes to existing directives<label id="modifieddirectives">
 <p>
 <descrip>
-	<p>No changes to existing directives in this version.
+	<tag>acl</tag>
+	<p>The <em>CONNECT</em> ACL definition is now built-in.
 
 </descrip>
 
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 57bd8a09e2..d1a9fb047b 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -954,7 +954,8 @@ DEFAULT: all src all
 DEFAULT: manager url_regex -i ^cache_object:// +i ^https?://[^/]+/squid-internal-mgr/
 DEFAULT: localhost src 127.0.0.1/32 ::1
 DEFAULT: to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
-DEFAULT_DOC: ACLs all, manager, localhost, and to_localhost are predefined.
+DEFAULT: acl CONNECT method CONNECT
+DEFAULT_DOC: ACLs all, manager, localhost, to_localhost, and CONNECT are predefined.
 DOC_START
 	Defining an Access List
 
@@ -1365,7 +1366,6 @@ acl Safe_ports port 280		# http-mgmt
 acl Safe_ports port 488		# gss-http
 acl Safe_ports port 591		# filemaker
 acl Safe_ports port 777		# multiling http
-acl CONNECT method CONNECT
 NOCOMMENT_END
 DOC_END
 
-- 
2.47.3