From b8fad99f09a1543ce74ed06265053e986584a79e Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 20 Mar 2006 09:03:09 +0000
Subject: start working towards 7.15.4

---
 CHANGES                |  2 ++
 RELEASE-NOTES          | 25 +++++++------------------
 include/curl/curlver.h |  6 +++---
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/CHANGES b/CHANGES
index bd2a1a7e9..ab2f4ce81 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@
 
                                   Changelog
 
+Version 7.15.3 (20 March 2006)
+
 Daniel (16 March 2006)
 - Tor Arntsen provided a RPM spec file for AIX Toolbox, that now is included
   in the release archive.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5ce5b8e11..c60bae26b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,7 +1,7 @@
-Curl and libcurl 7.15.3
+Curl and libcurl 7.15.4
 
- Public curl release number:               93
- Releases counted from the very beginning: 120
+ 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
@@ -11,30 +11,19 @@ Curl and libcurl 7.15.3
 
 This release includes the following changes:
 
- o added docs for --ftp-method and CURLOPT_FTP_FILEMETHOD
+ o 
 
 This release includes the following bugfixes:
 
- o TFTP Packet Buffer Overflow Vulnerability:
-   http://curl.haxx.se/docs/adv_20060320.html
- o properly detecting problems with sending the FTP command USER
- o wrong error message shown when certificate verification failed
- o multi-part formpost with multi interface crash
- o the CURLFTPSSL_CONTROL setting for CURLOPT_FTP_SSL is acknowledged
- o "SSL: couldn't set callback" is now treated as a less serious problem
- o Interix build fix
- o fixed curl "hang" when out of file handles at start
- o prevent FTP uploads to URLs with trailing slash
+ o 
 
 Other curl-related news since the previous public release:
 
- o pycurl-7.15.2 has been released: http://pycurl.sf.net
- o http://curl.download.nextag.com/ is a new US curl web mirror!
+ o 
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Gisle Vanem, Dan Fandrich, Thomas Klausner, Todd Vierling, Peter Heuchert,
- Markus Koetter, David McCreedy, Tor Arntsen
+ 
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/include/curl/curlver.h b/include/curl/curlver.h
index 7ecdd5475..e61a2a739 100644
--- a/include/curl/curlver.h
+++ b/include/curl/curlver.h
@@ -28,13 +28,13 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.15.3-CVS"
+#define LIBCURL_VERSION "7.15.4-CVS"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 7
 #define LIBCURL_VERSION_MINOR 15
-#define LIBCURL_VERSION_PATCH 3
+#define LIBCURL_VERSION_PATCH 4
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -51,6 +51,6 @@
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-#define LIBCURL_VERSION_NUM 0x070f03
+#define LIBCURL_VERSION_NUM 0x070f04
 
 #endif /* __CURL_CURLVER_H */
-- 
cgit v1.2.3