7.5-commitcurl-7_5

5 files changed, 78 insertions, 10 deletions

diff --git a/CHANGES b/CHANGES
index 0c8427abf..d084ab503 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,25 @@
 
                                History of Changes
 
+Version 7.5
+
+Daniel (1 December 2000)
+- Craig Davison gave us his updates on the VC++ makefiles, so now curl should
+  build fine with the Microsoft compiler on windows too.
+
+- Fixed the libcurl versioning so that we don't ruin old programs when
+  releasing new shared library interfaces.
+
+Daniel (30 November 2000)
+- Renamed docs/README.curl to docs/MANUAL to better reflect what the document
+  actually contains.
+
+Daniel (29 November 2000)
+- I removed a bunch of '#if 0' sections from the code. They only make things
+  harder to follow. After all, we do have all older versions in the CVS.
+
+Version 7.5-pre5
+
 Daniel (28 November 2000)
 - I filled in more error codes in the man page error code list that had been
   lagging.
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 56f705681..3cadc83ed 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -470,7 +470,7 @@ char *curl_getenv(char *variable);
 char *curl_version(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.5-pre4"
+#define LIBCURL_VERSION "7.5"
 #define LIBCURL_VERSION_NUM 0x070500
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 92c88151e..ba0fd3333 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -86,6 +86,35 @@ lib_LTLIBRARIES = libcurl.la
 
 INCLUDES = -I$(top_srcdir)/include
 
+libcurl_la_LDFLAGS = -version-info 1:0:0
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
+# 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that age
+# must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information: 
+#
+# 1.Start with version information of 0:0:0 for each libtool library.
+#
+# 2.Update the version information only immediately before a public release of
+# your software. More frequent updates are unnecessary, and only guarantee
+# that the current interface number gets larger faster.
+#
+# 3.If the library source code has changed at all since the last update, then
+# increment revision (c:r:a becomes c:r+1:a).
+#
+# 4.If any interfaces have been added, removed, or changed since the last
+# update, increment current, and set revision to 0.
+#
+# 5.If any interfaces have been added since the last public release, then
+# increment age.
+#
+# 6.If any interfaces have been removed since the last public release, then
+# set age to 0.
+#
+
 libcurl_la_SOURCES =  arpa_telnet.h  file.c         getpass.h      netrc.h        timeval.c base64.c       file.h         hostip.c       progress.c     timeval.h base64.h       formdata.c     hostip.h       progress.h     cookie.c       formdata.h     http.c         sendf.c        cookie.h       ftp.c          http.h         sendf.h        url.c dict.c         ftp.h          if2ip.c        speedcheck.c   url.h dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h download.c     getdate.h      ldap.c         ssluse.c       version.c download.h     getenv.c       ldap.h         ssluse.h       escape.c       getenv.h       mprintf.c      telnet.c       escape.h       getpass.c      netrc.c        telnet.h       getinfo.c highlevel.c strequal.c strequal.h easy.c security.h security.c krb4.c memdebug.c memdebug.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -98,7 +127,6 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../src
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libcurl_la_LDFLAGS = 
 libcurl_la_LIBADD = 
 libcurl_la_OBJECTS =  file.lo timeval.lo base64.lo hostip.lo progress.lo \
 formdata.lo cookie.lo http.lo sendf.lo ftp.lo url.lo dict.lo if2ip.lo \
diff --git a/src/hugehelp.c b/src/hugehelp.c
index 17dc5b92a..e8f1b5a4a 100644
--- a/src/hugehelp.c
+++ b/src/hugehelp.c
@@ -651,7 +651,7 @@ puts (
 "     13   FTP weird PASV reply, Curl couldn't parse the reply\n"
 "          sent to the PASV request.\n"
 "\n"
-"     14   FTP weird 227 formay. Curl couldn't parse the 227-line\n"
+"     14   FTP weird 227 format. Curl couldn't parse the 227-line\n"
 "          the server sent.\n"
 "\n"
 "     15   FTP can't get host. Couldn't resolve the host IP we got\n"
@@ -723,6 +723,22 @@ puts (
 "     41   Function not found. A required LDAP function was not\n"
 "          found.\n"
 "\n"
+"     42   Aborted by callback. An application told curl to abort\n"
+"          the operation.\n"
+"\n"
+"     43   Internal error. A function was called with a bad param­\n"
+"          eter.\n"
+"\n"
+"     44   Internal error. A function was called in a bad order.\n"
+"\n"
+"     45   Interface error. A specified outgoing interface could\n"
+"          not be used.\n"
+"\n"
+"     46   Bad password entered. An error was signalled when the\n"
+"          password was entered.\n"
+"     47   Too many redirects. When following redirects, curl hit\n"
+"          the maximum amount.\n"
+"\n"
 "     XX   There will appear more error codes here in future\n"
 "          releases. The existing ones are meant to never change.\n"
 "\n"
@@ -750,6 +766,8 @@ puts (
 "      - Douglas E. Wegscheid <wegscd@whirlpool.com>\n"
 "      - Mark Butler <butlerm@xmission.com>\n"
 "      - Eric Thelin <eric@generation-i.com>\n"
+);
+ puts(
 "      - Marc Boucher <marc@mbsi.ca>\n"
 "      - Greg Onufer <Greg.Onufer@Eng.Sun.COM>\n"
 "      - Doug Kaufman <dkaufman@rahul.net>\n"
@@ -762,8 +780,6 @@ puts (
 "      - Linus Nielsen <Linus.Nielsen@haxx.se>\n"
 "      - Felix von Leitner <felix@convergence.de>\n"
 "      - Dan Zitter <dzitter@zitter.net>\n"
-);
- puts(
 "      - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>\n"
 "      - Chris Maltby <chris@aurema.com>\n"
 "      - Ron Zapp <rzapper@yahoo.com>\n"
@@ -786,9 +802,12 @@ puts (
 "      - Richard Prescott\n"
 "      - Jason S. Priebe <priebe@wral-tv.com>\n"
 "      - T. Bharath <TBharath@responsenetworks.com>\n"
+"      - Alexander Kourakos <awk@users.sourceforge.net>\n"
+"      - James Griffiths <griffiths_james@yahoo.com>\n"
 "\n"
 "WWW\n"
 "     http://curl.haxx.se\n"
+"\n"
 "FTP\n"
 "     ftp://ftp.sunet.se/pub/www/utilities/curl/\n"
 "\n"
@@ -1057,6 +1076,8 @@ puts (
 "\n"
 "        curl -F \"file=@cooltext.txt\" -F \"yourname=Daniel\" \\\n"
 "             -F \"filedescription=Cool text file with cool text inside\" \\\n"
+);
+ puts(
 "             http://www.post.com/postit.cgi\n"
 "\n"
 "  So, to send two files in one post you can do it in two ways:\n"
@@ -1075,12 +1096,12 @@ puts (
 "  that referred to actual page, and curl allows the user to specify that\n"
 "  referrer to get specified on the command line. It is especially useful to\n"
 "  fool or trick stupid servers or CGI scripts that rely on that information\n"
-);
- puts(
 "  being available or contain certain data.\n"
 "\n"
 "        curl -e www.coolsite.com http://www.showme.com/\n"
 "\n"
+"  NOTE: The referer field is defined in the HTTP spec to be a full URL.\n"
+"\n"
 "USER AGENT\n"
 "\n"
 "  A HTTP request has the option to include information about the browser\n"
@@ -1326,6 +1347,8 @@ puts (
 "        curl https://www.secure-site.com\n"
 "\n"
 "  Curl is also capable of using your personal certificates to get/post files\n"
+);
+ puts(
 "  from sites that require valid certificates. The only drawback is that the\n"
 "  certificate needs to be in PEM-format. PEM is a standard and open format to\n"
 "  store certificates with, but it is not used by the most commonly used\n"
@@ -1336,8 +1359,6 @@ puts (
 "  included in recent versions of OpenSSL, and for older versions Dr Stephen\n"
 "  N. Henson has written a patch for SSLeay that adds this functionality. You\n"
 "  can get his patch (that requires an SSLeay installation) from his site at:\n"
-);
- puts(
 "  http://www.drh-consultancy.demon.co.uk/\n"
 "\n"
 "  Example on how to automatically retrieve a document using a certificate with\n"
diff --git a/src/version.h b/src/version.h
index 8a984dc12..57dca0df4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.5-pre3"
+#define CURL_VERSION "7.5"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "