David Shaw fixes

diff --git a/CHANGES b/CHANGES
index c3232f5..8c9036c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,15 @@
                                   Changelog
 
 
+Daniel (23 June 2005)
+- David Shaw's fix that unifies proxy string treatment so that a proxy given
+  with CURLOPT_PROXY can use a http:// prefix and user + password. The user
+  and password fields are now also URL decoded properly. Test case 264 added
+  to verify.
+
+Daniel (22 June 2005)
+- David Shaw updated libcurl.m4
+
 Daniel (14 June 2005)
 - Gisle Vanem fixed a potential thread handle leak. Bug report #1216500.
   Comment in http://curl.haxx.se/mail/lib-2005-06/0059.html

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1ca8a6a..4c4c5a0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -11,10 +11,12 @@ Curl and libcurl 7.14.1
 
 This release includes the following changes:
  
+ o -x/CURL_PROXY strings may now contain user+password
  o --trace-time now outputs the full microsecond, all 6 digits
 
 This release includes the following bugfixes:
 
+ o improved libcurl.m4
  o possible memory leak in windows name resolves
  o c-ares enabled build with mingw
  o proxy host set with numerical IPv6 address
@@ -34,6 +36,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  John McGowan, Georg Wicherski, Andres Garcia, Eric Cooper, Todd Kulesza,
- Tupone Alfredo
+ Tupone Alfredo, Gisle Vanem, David Shaw
 
         Thanks! (and sorry if I forgot to mention someone)