From bbe10cb0cb45eae6e737523b215ecdf43d385765 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 7 May 2002 21:52:38 +0000
Subject: [PATCH] 7.9.7-pre2

---
 CHANGES             | 27 +++++++++++++++++++++++++++
 include/curl/curl.h |  2 +-
 src/version.h       |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 20f78c37f..6f019f320 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,33 @@
 
                                History of Changes
 
+Version 7.9.7-pre2
+
+Daniel (7 May 2002)
+- Updated the man page with --trace-ascii and -j/--junk-session-cookies.
+
+- Made --trace-ascii do pretty much the same as --trace but without the hex
+  part in the output.
+
+- Added CURLOPT_COOKIESESSION that when enabled makes libcurl ignore session
+  cookies read from a file. This option is enforced by the curl command line
+  tool using the new -j/--junk-session-cookies option. After discussions with
+  Kevin Roth. This makes it easier to use curl to fully emulate a browser's
+  behavior, even when it comes to "session cookies". Session cookies are
+  cookies that a normal browser discards when the browser is shut
+  down. They're identified by not having any expire date/time.
+
+- When CURLOPT_DEBUGDATA was set, it ruined the CURLOPT_STDERR setting and
+  this was discovered when --trace was made to crash.
+
+- Using -v and --trace at the same time confused matters. -v is now pretty
+  much ignored when --trace or --trace-ascii is used.
+
+- Made --trace (and --trace-ascii) support - as file name to pass output to
+  stdout instead. It makes it consistent with how other options work.
+
+Version 7.9.7-pre1
+
 Daniel (6 May 2002)
 - Added multi-post.c to the examples directory. I got the basic source for
   this from Gustaf Hui.
diff --git a/include/curl/curl.h b/include/curl/curl.h
index df4f093b1..5ca508722 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -684,7 +684,7 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.9.7-pre1"
+#define LIBCURL_VERSION "7.9.7-pre2"
 #define LIBCURL_VERSION_NUM 0x070907
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
diff --git a/src/version.h b/src/version.h
index 64f6e5e4a..8fc21b3df 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.9.6"
+#define CURL_VERSION "7.9.7-pre2"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "