mention recent additions

2 files changed, 26 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index 9ee226bb7..595492691 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,25 @@
 
                                   Changelog
 
+Daniel (10 April 2006)
+- Ates Goral found out that if you specified both CURLOPT_CONNECTTIMEOUT and
+  CURLOPT_TIMEOUT, the _longer_ time would wrongly be used for the SSL
+  connection time-out!
+
+- I merged my hiper patch (http://curl.haxx.se/libcurl/hiper/) into the main
+  sources. See the lib/README.multi_socket for implementation story with
+  details. Don't expect it to work fully yet. I don't intend to blow any
+  whistles or ring any bells about it until I'm more convinced it works at
+  least somewhat reliably.
+
+Daniel (7 April 2006)
+- David McCreedy's EBCDIC and TPF changes. Three new curl_easy_setopt()
+  options (callbacks) were added:
+
+  CONV_FROM_NETWORK_FUNCTION
+  CONV_TO_NETWORK_FUNCTION
+  CONV_FROM_UTF8_FUNCTION 
+
 Daniel (5 April 2006)
 - Michele Bini modified the NTLM code to work for his "weird IIS case"
   (http://curl.haxx.se/mail/lib-2006-02/0154.html) by adding the NTLM hash
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9036a0091..332c5c45c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,19 +3,22 @@ Curl and libcurl 7.15.4
  Public curl release number:               94
  Releases counted from the very beginning: 121
  Available command line options:           112
- Available curl_easy_setopt() options:     129
- Number of public functions in libcurl:    46
- Amount of public web site mirrors:        31
+ Available curl_easy_setopt() options:     132
+ Number of public functions in libcurl:    49
+ Amount of public web site mirrors:        29
  Number of known libcurl bindings:         32
  Number of contributors:                   492
 
 This release includes the following changes:
 
+ o curl_multi_socket() API added (still mostly untested)
+ o conversion callback options for EBCDIC <=> ASCII conversions
  o added CURLINFO_FTP_ENTRY_PATH
  o less blocking for the multi interface during SSL connect negotiation 
 
 This release includes the following bugfixes:
 
+ o SSL connect time-out
  o Improved NTLM functionality
  o following redirects with more than one question mark in source URL
  o fixed debug build crash with -d
@@ -33,6 +36,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Dan Fandrich, Ilja van Sprundel, David McCreedy, Tor Arntsen, Xavier Bouchoux,
- David Byron, Michele Bini
+ David Byron, Michele Bini, Ates Goral
 
         Thanks! (and sorry if I forgot to mention someone)