diff --git a/CHANGES b/CHANGES index b77d9f93d..f04f8219a 100644 --- a/CHANGES +++ b/CHANGES @@ -14,7 +14,7 @@ Daniel (11 April 2006) 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! + connection time-out! Katie Wang provided a fine patch. - 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 diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 9a5da0a15..4879c36f7 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -37,6 +37,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, Ates Goral + David Byron, Michele Bini, Ates Goral, Katie Wang Thanks! (and sorry if I forgot to mention someone)