update

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 999a040a547e2dcd5ad331f25ad6ac0499b031d9..559b4753ff249d3524967e5fc1d848b23f9c567a 100644 (file)
--- 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 6c91b515150161112beaa9e1898f6b532f49c62a..6e582b65a06fe68af9ba328714c307f1f61d8304 100644 (file)
--- 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):