From 2a72641a0b54dd5db079fd6f797e47a5907d6b2a Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 8 Apr 2002 22:53:22 +0000
Subject: [PATCH] 7.9.6-pre4 commit

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

diff --git a/CHANGES b/CHANGES
index 3d7699b..8c204ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,28 @@
 
                                History of Changes
 
+Daniel (8 April 2002)
+- Michael Curtis provided new functionality for curl on some platforms. Using
+  the --environment option, curl will *set* a bunch of environment variables
+  to values. The names are the same ones as for the -w/--writeout option.
+
+  For now, this only works on the RISC OS version, as this feature relies on
+  both OS support and that it matches OS paradigms.
+
+- Jacky Lam provided a fix for getting headers-only when the reply is HTTP/1.0
+  and 304, I edited it slightly.
+
+Daniel (5 April 2002)
+- As requested by Jay Graves, the '.curlrc' file (or _curlrc as it is called
+  when used in windows), is now loaded from the current directory if the HOME
+  environment variable isn't set (or if it is too long). I also enlarged the
+  array used to store the full file path in, to 512 bytes.
+
+- Kevin Roth pointed out to me why the "19 March" change regarding -G and -I
+  was stupid and the change was reverted. Added test case 48 to verify the
+  functionality.
+
+Version 7.9.6-pre3
 
 Daniel (4 April 2002)
 - Jonatan Lander brought a patch that makes curl/curl.h compile nicely on
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 296f2e9..f803d8c 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -637,7 +637,7 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.9.6-pre2"
+#define LIBCURL_VERSION "7.9.6-pre3"
 #define LIBCURL_VERSION_NUM 0x070906
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
diff --git a/src/version.h b/src/version.h
index ee085e5..82df757 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.9.6-pre1"
+#define CURL_VERSION "7.9.6-pre3"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
-- 
2.7.4