The unified diff between revisions [812a98e1..] and [0713a548..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'ChangeLog'

#
#
# patch "ChangeLog"
#  from [e42ce65c01fb05311e26c1deefec1e6324f19ab0]
#    to [d1008bce2685d77472a9261ddf3a479d66e995c5]
#
============================================================
--- ChangeLog	e42ce65c01fb05311e26c1deefec1e6324f19ab0
+++ ChangeLog	d1008bce2685d77472a9261ddf3a479d66e995c5
@@ -1,3 +1,23 @@
+Changes to squid-2.6 (not yet released)
+
+	- New --enable-default-hostsfile configure option
+	- Added username info to active_requests cachemgr stats
+	- Modified squid MIB to incorporate squid.conf visible_hostname
+	- Added multi-line capability in squid.conf
+	- Added new httpd_suppress_version_string configuration directive
+	- WCCPv2 support
+	- Negotiate authentication scheme support
+	- NTLM authentication scheme rewritten
+	- Customizable access log formats
+	- Selective access logging
+	- Access logging via syslog
+	- Reverse proxy enhancements, with new cache_peer based forwarding
+	  model.
+	- LDAP based Digest helper (Note: not true LDAP integration, just using
+	  LDAP for storage of the Digest hashes)
+	- Improved helper communication protocol
+	- External ACL improvements. %PATH, log= (more to come before release)
+
 Changes to squid-2.5.STABLE14 (not yet released)
 	- [Minor] icons not displayed when visible_hostname is a
 	  short hostname (witout domain). (Bug #1532)
@@ -17,7 +37,7 @@ Changes to squid-2.5.STABLE13 (12 Mar 20
 	  (Bug #1472)
 	- [Minor] Squid crash when asyncio function counters url accessed
 	  from Cachemgr CGI (Bug #1464)
-	- [Cosmetic] Linix compile warning about prctl called with too few
+	- [Cosmetic] Linux compile warning about prctl called with too few
  	  arguments (Bug #1483)
 	- [Minor] Wrong timezone declaration for 64 bit Irix (Bug #1479)
 	- [Minor] Some 206 responses logged incorrectly (Bug #1511)