From: wessels <>
Date: Sat, 14 Feb 1998 01:19:40 +0000 (+0000)
Subject: update
X-Git-Tag: SQUID_3_0_PRE1~4094
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e0f047198bae6a4254327c21669d73eb9a224c0;p=thirdparty%2Fsquid.git

update
---

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 999a040a54..559b4753ff 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -60,6 +60,7 @@ Special thanks go to people who have volunteered their time, effort, and ideas t
 	Pierre-Louis BRENAC <brenacp@esiee.fr>
 	Dale <dale@server.ctam.bitmcnit.bryansk.su>
 	Masashi Fujita <objectx@bandit.co.jp>
+	Michael Pelletier <mikep@comshare.com>
 
 Development of this caching software is funded by the National Science
 Foundation (grant NCR-9521745).  Paid staff members on the caching
diff --git a/ChangeLog b/ChangeLog
index 6c91b51515..6e582b65a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,10 @@
 	  bit and did not clear the swap_file_number in the filemap or
 	  in the StoreEntry, so the swap file could get unlinked later
 	  when it was really released.
+	- Fixed FTP so that ';type=X' specifically sets the HTTP reply
+	  content-type and content-encoding (Henrik Nordstrom).
+	- Removed 'icon_content_type' configuration option.  Content
+	  types now taken from mime.conf (Henrik Nordstrom).
 
 Changes to squid-1.2.beta14 (Feb 6, 1998):