two ipresolve fixes

2 files changed, 10 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index b0471e75b..b802a6112 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,12 @@
                                   Changelog
 
 Daniel (14 April 2004)
+- Asking for CURL_IPRESOLVE_V6 when ipv6 addresses can't be resolved will
+  now cause the resolve function to return NULL immediately. This flaw was
+  pointed out by Gisle Vanem.
+
+- Gisle Vanem made curl -4/-6 actually set the desired option to libcurl.
+
 - runtests.pl now has a new option (-p) that will display "interesting" log
   files to stdout in case of a test failure. This is primarily intended to be
   used in the 'full-test' make target that is used by the autobuild tests, as
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 77aea602e..9caf178c5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -13,6 +13,10 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o CURLOPT_IPRESOLVE set to CURL_IPRESOLVE_V6 will now cause a returned error
+   if the host only can resolve ipv4 addresses
+ o curl -4/-6 now actually sets the requested option in libcurl
+ o multi interface on Windows without ares works again
  o improved resolution for the CURLINFO_*_TIME info variables
  o getting only a 100 Continue response and nothing else, when talking HTTP,
    is now treated as an error by libcurl