7.10.4-pre6 commit

3 files changed, 13 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index ec380392b..06c205d3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,17 @@
                                   Changelog
 
 Daniel (31 Mar)
+- More fixes for the SSL session ID cache checks when SSL configs are changed
+  between connections. Based on tests and talks with Richard Bramante.
+
+- Guillaume Cottenceau provided a patch that added CURLOPT_UNRESTRICTED_AUTH.
+  When enabled, it will prevent libcurl from limiting to which host it sends
+  user+password to when following locations. By default, libcurl only sends
+  name and password to the original host used in the first URL, but with this
+  option set it will send the auth info to all hosts it follows location
+  headers to. The new tool command line option for this is named
+  "--location-trusted".
+
 - Frankie Fong reported a problem with libcurl if you re-used an easy handle
   with a proxy, and you first made a https:// connction to a host and then
   switched to a http:// one to the same host. libcurl would then wrongly re-use
diff --git a/include/curl/curl.h b/include/curl/curl.h
index e7f5d5fd9..15004c4a8 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -814,7 +814,7 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.10.4-pre5"
+#define LIBCURL_VERSION "7.10.4-pre6"
 #define LIBCURL_VERSION_NUM 0x070a04
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
diff --git a/src/version.h b/src/version.h
index f97997464..e3b8a215c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.10.4-pre2"
+#define CURL_VERSION "7.10.4-pre6"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "