update

diff --git a/ChangeLog b/ChangeLog
index 2bbff6a53ea3c8ef3b62b608f750b619875b64ec..ed109e0d678976c1bdbfa59978697bd5ff6dfc3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+       - New MIME configuration, regular expression based
+       - Added request_timeout config option
+       - Multiple HTTP sockets (Lincoln Dale).
+       - Moved 'fds_are_n_free' check to httpAccept().
+       - s/USE_POLL/HAVE_POLL/; make poll() default if available.
+
 Changes to squid-1.2.alpha3 ():
 
        - Implemented persistent connections between clients and squid.