--protocols, license, src/config.h.in

2 files changed, 25 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 4fb5e6b18..ae748c4ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,24 @@
                                   Changelog
 
 
+Daniel (25 December 2004)
+- Removed src/config.h.in from CVS, it is now copied from the (generated)
+  lib/config.h.in instead, as they can very well be the same. This removes a
+  "manual hassle". You may want to re-run buildconf now.
+
+- Werner Koch filed Debian bug report #286794, mentioning that curl contained
+  non-free (by Debian's view) source code. This was Angus Mackay's
+  src/getpass.c source code. I tried to contact him about it to quickly solve
+  this issue, but his email addresses bounce and I got some time "over" and
+  reimplemented the functionality once brought by Angus. We no longer use any
+  of Angus' original code and the new function is much simpler (IMO). Issue
+  solved.
+
+Daniel (24 December 2004)
+- David Shaw added --protocols to curl-config, so that it now lists all
+  protocols libcurl was built to support. --feature no longer lists disabled
+  protocols.
+
 Daniel (23 December 2004)
 - David Shaw fixed the configure --disable-[protocol] variables so that
   curl-config --feature now works correctly!
@@ -25,6 +43,7 @@ Daniel (21 December 2004)
 - Fixed lib/select.c include order to build fine on FreeBSD
 
 - Fixed failf()'s reuse of the va_list variable that crashed on FreeBSD.
+  Pointed out by Peter Pentchev.
 
 Version 7.12.3 (20 December 2004)
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6b1a59f80..861f720e9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-Curl and libcurl 7.12.3
+Curl and libcurl 7.12.4
 
  Public curl release number:               85
  Releases counted from the very beginning: 112
@@ -10,12 +10,13 @@ Curl and libcurl 7.12.3
 
 This release includes the following changes:
 
- o 
+ o src/getpass.c license issue sorted
+ o curl -w now supports 'http_connect' for the proxy's response to CONNECT
+ o curl-config --protocols
 
 This release includes the following bugfixes:
 
  o minor memory leak when "version" is set in a cookie header
- o curl-config --feature lists the disabled protocols properly
  o builds fine on BeOS
  o builds and runs fine on FreeBSD
 
@@ -26,5 +27,7 @@ Other curl-related news since the previous public release:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
+ Dan Fandrich, Peter Pentchev, Marcin Konicki, Rune Kleveland, David Shaw,
+ Werner Koch
 
         Thanks! (and sorry if I forgot to mention someone)