7.9.5 commitcurl-7_9_5

6 files changed, 28 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index 49bae8462..198873b2a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,18 @@
                                History of Changes
 
 
+Version 7.9.5
+
+Daniel (7 March 2002)
+- Added docs/KNOWN_BUGS to the release archive.
+
 Daniel (6 March 2002)
+- Kevin Roth corrected a flaw in the curl client globbing code that made it
+  mess up backslashes. This was most notable on windows (cygwin) machines when
+  using file://.
+
+- Brad provided another fix for building outside the source-tree.
+
 - Ralph Mitchell patched away a few compiler warnings in tests/server/sws.c
 
 Daniel (5 March 2002)
diff --git a/docs/MANUAL b/docs/MANUAL
index 0af8c8205..8a66d1342 100644
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -246,25 +246,25 @@ POST (HTTP)
   -F accepts parameters like -F "name=contents". If you want the contents to
   be read from a file, use <@filename> as contents. When specifying a file,
   you can also specify the file content type by appending ';type=<mime type>'
-  to the file name. You can also post the contents of several files in one field.
-  For example, the field name 'coolfiles' is used to send three  files, with
-  different content types using the following syntax:
+  to the file name. You can also post the contents of several files in one
+  field.  For example, the field name 'coolfiles' is used to send three files,
+  with different content types using the following syntax:
 
         curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
         http://www.post.com/postit.cgi
 
   If the content-type is not specified, curl will try to guess from the file
-  extension  (it only knows a few), or use the previously specified type
-  (from an earlier file if several files are specified in a list) or else it
-  will  using the default type 'text/plain'.
+  extension (it only knows a few), or use the previously specified type (from
+  an earlier file if several files are specified in a list) or else it will
+  using the default type 'text/plain'.
 
   Emulate a fill-in form with -F. Let's say you fill in three fields in a
   form. One field is a file name which to post, one field is your name and one
   field is a file description. We want to post the file we have written named
   "cooltext.txt". To let curl do the posting of this data instead of your
-  favourite browser, you have to read the HTML source of the form page and find
-  the names of the input fields. In our example, the input field names are
-  'file', 'yourname' and 'filedescription'.
+  favourite browser, you have to read the HTML source of the form page and
+  find the names of the input fields. In our example, the input field names
+  are 'file', 'yourname' and 'filedescription'.
 
         curl -F "file=@cooltext.txt" -F "yourname=Daniel" \
              -F "filedescription=Cool text file with cool text inside" \
diff --git a/docs/libcurl/curl_multi_add_handle.3 b/docs/libcurl/curl_multi_add_handle.3
index b8b274da9..c2077a048 100644
--- a/docs/libcurl/curl_multi_add_handle.3
+++ b/docs/libcurl/curl_multi_add_handle.3
@@ -1,6 +1,6 @@
 .\" $Id$
 .\"
-.TH curl_multi_add_handle 3 "1 March 2002" "libcurl 7.9.5" "libcurl Manual"
+.TH curl_multi_add_handle 3 "4 March 2002" "libcurl 7.9.5" "libcurl Manual"
 .SH NAME
 curl_multi_add_handle - add an easy handle to a multi session
 .SH SYNOPSIS
@@ -11,6 +11,9 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle, CURL *easy_handle);
 .SH DESCRIPTION
 Adds a standard easy handle to the multi stack. This will make this multi
 handle control the specified easy handle.
+
+When an easy handle has been added to a multi stack, you can not and you must
+not use curl_easy_perform() on that handle!
 .SH RETURN VALUE
 CURLMcode type, general libcurl multi interface error code.
 .SH "SEE ALSO"
diff --git a/docs/libcurl/curl_multi_init.3 b/docs/libcurl/curl_multi_init.3
index 36336b1ff..e3619d5c5 100644
--- a/docs/libcurl/curl_multi_init.3
+++ b/docs/libcurl/curl_multi_init.3
@@ -10,7 +10,8 @@ curl_multi_init - Start a multi session
 .ad
 .SH DESCRIPTION
 This function returns a CURLM handle to be used as input to all the other
-multi-functions. This init call MUST have a corresponding call to
+multi-functions, sometimes refered to as a multi handle on some places in the
+documentation. This init call MUST have a corresponding call to
 \fIcurl_multi_cleanup\fP when the operation is complete.
 .SH RETURN VALUE
 If this function returns NULL, something went wrong and you cannot use the
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 5598c82b8..9b30508c3 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -616,7 +616,7 @@ CURLcode curl_global_init(long flags);
 void curl_global_cleanup(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.9.5-pre6"
+#define LIBCURL_VERSION "7.9.5"
 #define LIBCURL_VERSION_NUM 0x070905
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
diff --git a/src/version.h b/src/version.h
index dbdf61ac4..ec1798c84 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.9.5-pre4"
+#define CURL_VERSION "7.9.5"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "