7.8-pre2

include strtok.h to get the prototype
finally fixed the 'ret' compiler warning
2001-05-30 11:24:26 +00:00 · 2001-05-30 11:06:56 +00:00 · 2001-05-30 11:06:33 +00:00 · 2001-05-30 10:42:18 +00:00 · 2001-05-30 10:34:14 +00:00 · 2001-05-30 10:29:39 +00:00
360 changed files with 5579 additions and 3766 deletions
--- a/177
+++ b/177
@@ -6,7 +6,182 @@

                               History of Changes

-Version 7.7.3-pre1
+Daniel (30 May 2001)
+- Cris Bailiff wrote a makefile for building Solaris packages.
+
+- Sterling Hughes brought fixes for 'buildconf' (the build-from-CVS tool) and
+  we discussed and added a few CURL_GLOBAL_* flags in include/curl.h
+
+- Kjetil Jacobsen privately announced his python interface to libcurl,
+  available at http://pycurl.sourceforge.net/
+
+Daniel (29 May 2001)
+- Sterling Hughes fixed a strtok() problem in libcurl. It is not a thread-
+  safe function. Now configure checks for a thread-safe version, and
+  lib/strtok.c offers one for the systems that don't come with one included!
+
+- Mettgut Jamalla correctly pointed out that the -# progress bar was written
+  to stderr even though --stderr redirection was used. This is now corrected.
+
+- I moved out the list of contributors from the curl.1 man page and made a
+  separate docs/THANKS file. It makes the list easier to find, and made it
+  easier for me to make a separate web page with that same information.
+
+  I really do want all you guys mentioned in there to feel you get the credit
+  you deserve.
+
+- lib/easy.c didn't compile properly in the 7.8-pre1 due to a silly mistake
+
+Version 7.8-pre1
+
+Daniel (28 May 2001)
+- curl-config now supports '--vernum' that outputs a plain hexadecimal version
+  of the libcurl version number (using 8 bits for each 3 numbers). Version
+  7.7.4 appears as 070704
+
+- Wrote man pages for curl_global_init and curl_global_cleanup...
+
+- T. Bharath brought news about the usage of the OpenSSL interface that was
+  not previously taken into consideration and thus caused libcurl to leak
+  memory.  The only somewhat sane approach to fix this dilemma, is adding two
+  two new functions curl_global_init() and curl_global_cleanup() that should
+  be called *ONCE* by the application using libcurl. The init should be done
+  only at startup, no matter how many threads the application is gonna use,
+  and the cleanup should be called when the application has finished using
+  libcurl completely.
+
+  *** UPGRADE NOTICE ***
+
+  If you write applications using libcurl, you really want to use the two
+  functions mentioned above !!!
+
+  I can't say I think this is a very beautiful solution, but as OpenSSL
+  insists on making lots of stuff on a "global" scope, we're forced to walk
+  the path they point us to.
+
+- Moving more test cases into the new file format.
+
+Version 7.7.4-pre3
+
+Daniel (23 May 2001)
+- Introduced a new file format for storing test cases, and thus I had to
+  modify all the perl test scripts and more (I added a new one). I have not
+  "ported" all the old test cases to the new format yet, but it'll come.
+
+  The main advantage of this new format is that all test data for each test
+  case is stored in a single file. It gives a better overview for each test
+  case and a lot less files.
+
+- Andr<64>s Garc<72>a brought a fix for the netscape/mozilla cookie file parsing
+  function, as it turns out it doesn't always store the path!
+
+Daniel (22 May 2001)
+- As was reported anonymously, when FAILONERROR was used, the httpcode was
+  not stored properly and thus wasn't possibly to read after a transfer with
+  the curl_easy_getinfo() function. This is now corrected.
+
+- Installed and made use of the following tool versions:
+    autoconf 2.50
+    libtool 1.4
+    automake 1.4-p1
+
+  I wouldn't recommend any developer to try to generate things with older
+  versions than these. Building from CVS will probably more or less require
+  at least these versions.
+
+  As a result of this, the configure script grew to more than double its
+  previous size!
+
+  Arkadiusz Miskiewicz helped me by pointing out I had to remove my
+  acinclude.m4 file before I could get it working!
+
+Daniel (21 May 2001)
+- I made ftps:// work. Added test case 400 to the release archive, as the
+  first ftps:// test case. Requires stunnel.
+
+- Also made the test cases that runs ssl tests not run if libcurl isn't built
+  with ssl support.
+
+Daniel (19 May 2001)
+- Made the configure not add any extra -L LDFLAGS or -I CPPFLAGS unless they
+  are actually needed. Albert Chin's and Domenico Andreoli's suggestions
+  helped out.
+
+Version 7.7.4-pre2
+
+Daniel (18 May 2001)
+- Nicer configure-check for the OpenSSL headers, which then sets the proper
+  variable to have curl-config be good. (Albert Chin provided the fix)
+
+- For systems that don't have theiw own 'strlcat()' libcurl provides its own.
+  It was now renamed to prevent collides with other libs. (After discussions
+  with Sterling Hughes and the implications this had on PHP builds.)
+
+Daniel (17 May 2001)
+- Colm Buckley posted a detailed bug report on (the debianized) 7.7.3, that
+  turned out to be a problem with the debian-built 7.7.3-package that
+  contained files from the 7.7.2 release!
+
+- I added the CURLE_ALREADY_COMPLETE again, but with a fake value, just to
+  make programs that use it, not fail when compiling against this version of
+  libcurl.
+
+Daniel (14 May 2001)
+- Pawel A. Gajda fixed a problem with resumed transfers on re-used persistent
+  connections.
+
+Version 7.7.4-pre1
+
+Daniel (14 May 2001)
+- Jun-ichiro itojun Hagino fixed FTP PORT for IPv6-enabled libcurl.
+
+- Added the first HTTPS test to the test suite in the release archive.
+
+Daniel (12 May 2001)
+- Jukka Pihl suggested that if (lib)curl is told to verify the peer's
+  certificate and the peer can't be verified, it should fail and return a
+  proper error code. I added a brand new error code named
+  CURLE_SSL_PEER_CERTIFICATE for this purpose.
+
+Daniel (11 May 2001)
+- As was discussed with Frederic Lepied a while ago, I now made libcurl not
+  return error even though no data was transfered on upload/download resume
+  when the no transfer is needed. The CURLE_ALREADY_COMPLETE error was removed
+  from the header file to make any implemenator that uses that to be aware of
+  the fact that it can't be returned anymore!
+
+- Improved general header-parsing to better allow white spaces and more.
+
+- Rodney Simmons proved the fix I did yesterday was bad and I had to post
+  another one.
+
+- Ingo Wilken patched away two redirect problems more!
+  
+Daniel (10 May 2001)
+- Cris Bailiff correctly noted that the space-after-header problem with
+  Location: is present on several other places in the libcurl sources.
+
+- Ingo Wilken patched away a problem libcurl had when following Location:
+  headers with an extra space after the colon.
+
+- Rodney Simmons found out that multiple FTP transfers did not treat relative
+  directories correctly.
+
+Daniel (9 May 2001)
+- Getting an FTP file with CURLOPT_NOBODY set (or -I from the command line),
+  makes curl use the non-standard ftp command "SIZE". If it failed, libcurl
+  returned error. Starting now, it just don't output the file size instead.
+  Anonymous bug report.
+
+- stunnel.pm was accidentally left out from the release archive, it is now
+  added (stunnel is needed to run the https-tests in the test suite)
+  
+Daniel (7 May 2001)
+- Corrected two minor compiler warnings due to the FILE * to void * conversion
+  that I missed at two places. J<>rn Hartroth brought me patches. Sander Gates
+  filed a bug report on this.
+
+Version 7.7.3

 Daniel (4 May 2001)
 - All callback functions now take 'void *' instead of 'FILE *'. This is made
--- a/2
+++ b/2
@@ -10,6 +10,8 @@ This file is only present in the CVS - never in release archives. It contains
 information about other files and things that the CVS repository keeps in its
 inner sanctum.

+Use autoconf 2.50 and no earlier. Also, try having automake 1.4 and libtool
+1.4 at least.


  CHANGES.0     contains ancient changes.
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign no-dependencies

 EXTRA_DIST = \
 	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \
-	config-win32.h reconf packages/README Makefile.dist
+	config-win32.h reconf packages/README Makefile.dist \
+	curl-config.in libtool

 bin_SCRIPTS = curl-config

@@ -47,3 +48,18 @@ rpm:
 	rpm -ba --clean --rmsource $$RPM_TOPDIR/SPECS/$(RPMDIST).spec ; \
 	mv $$RPM_TOPDIR/RPMS/i386/$(RPMDIST)-*.rpm . ; \
 	mv $$RPM_TOPDIR/SRPMS/$(RPMDIST)-*.src.rpm .
+
+#
+# Build a Solaris pkkgadd format file
+# run 'make pkgadd' once you've done './configure' and 'make' to make a Solaris pkgadd format
+# file (which ends up back in this directory).
+# The pkgadd file is in 'pkgtrans' format, so to install on Solaris, do
+# pkgadd -d ./HAXXcurl-*
+#
+
+# gak - libtool requires an absoulte directory, hence the pwd below...
+pkgadd:
+	umask 022 ; \
+	make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \
+	cat LEGAL MITX.txt MPL-1.1.txt > $(srcdir)/packages/Solaris/copyright ; \
+	cd $(srcdir)/packages/Solaris && $(MAKE) package
--- a/acconfig.h
+++ b/acconfig.h
@@ -51,3 +51,6 @@

 /* Define this to your Entropy Gathering Daemon socket pathname */
 #undef EGD_SOCKET
+
+/* Define if you have a working OpenSSL installation */
+#undef OPENSSL_ENABLED
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,92 +0,0 @@
-#serial 19
-
-dnl By default, many hosts won't let programs access large files;
-dnl one must use special compiler options to get large-file access to work.
-dnl For more details about this brain damage please see:
-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-
-dnl Written by Paul Eggert <eggert@twinsun.com>.
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_TEST_INCLUDES
-AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
-  [[#include <sys/types.h>
-    /* Check that off_t can represent 2**63 - 1 correctly.
-       We can't simply "#define LARGE_OFF_T 9223372036854775807",
-       since some C++ compilers masquerading as C compilers
-       incorrectly reject 9223372036854775807.  */
-#   define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-    int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-			&& LARGE_OFF_T % 2147483647 == 1)
-		       ? 1 : -1];
-  ]])
-
-dnl Internal subroutine of AC_SYS_LARGEFILE.
-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
-  [AC_CACHE_CHECK([for $1 value needed for large files], $3,
-     [$3=no
-      AC_TRY_COMPILE([$5],
-	[$6], 
-	,
-	[AC_TRY_COMPILE([#define $1 $2]
-[$5]
-	   ,
-	   [$6],
-	   [$3=$2])])])
-   if test "[$]$3" != no; then
-     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
-   fi])
-
-AC_DEFUN(AC_SYS_LARGEFILE,
-  [AC_REQUIRE([AC_PROG_CC])
-   AC_ARG_ENABLE(largefile,
-     [  --disable-largefile     omit support for large files])
-   if test "$enable_largefile" != no; then
-
-     AC_CACHE_CHECK([for special C compiler options needed for large files],
-       ac_cv_sys_largefile_CC,
-       [ac_cv_sys_largefile_CC=no
-        if test "$GCC" != yes; then
-	  # IRIX 6.2 and later do not support large files by default,
-	  # so use the C compiler's -n32 option if that helps.
-	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
-	    [ac_save_CC="$CC"
-	     CC="$CC -n32"
-	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
-	       ac_cv_sys_largefile_CC=' -n32')
-	     CC="$ac_save_CC"])
-        fi])
-     if test "$ac_cv_sys_largefile_CC" != no; then
-       CC="$CC$ac_cv_sys_largefile_CC"
-     fi
-
-     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-       ac_cv_sys_file_offset_bits,
-       [Number of bits in a file offset, on hosts where this is settable.],
-       AC_SYS_LARGEFILE_TEST_INCLUDES)
-     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
-       ac_cv_sys_large_files,
-       [Define for large files, on AIX-style hosts.],
-       AC_SYS_LARGEFILE_TEST_INCLUDES)
-   fi
-  ])
-
-AC_DEFUN(AC_FUNC_FSEEKO,
-  [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
-     ac_cv_sys_largefile_source,
-     [Define to make fseeko visible on some hosts (e.g. glibc 2.2).],
-     [#include <stdio.h>], [return !fseeko;])
-   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-   # in glibc 2.1.3, but that breaks too many other things.
-   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-
-   AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko,
-     [ac_cv_func_fseeko=no
-      AC_TRY_LINK([#include <stdio.h>],
-        [return fseeko && fseeko (stdin, 0, 0);],
-	[ac_cv_func_fseeko=yes])])
-   if test $ac_cv_func_fseeko != no; then
-     AC_DEFINE(HAVE_FSEEKO, 1,
-       [Define if fseeko (and presumably ftello) exists and is declared.])
-   fi])
--- a/15
+++ b/15
@@ -1,6 +1,13 @@
 #!/bin/sh

-automake
-aclocal
-autoheader
-autoconf
+die(){
+	echo "$@"
+	exit
+}
+
+MAKEFILES=`find . -name Makefile.am | sed 's/\.am$//'`
+
+automake $MAKEFILES || die "The command 'automake $MAKEFILES' failed"
+aclocal           || die "The command 'aclocal' failed"
+autoheader        || die "The command 'autoheader' failed"
+autoconf          || die "The command 'autoconf' failed"
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-#
+
+timestamp='2001-04-20'
+
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -30,26 +32,86 @@
 # exits with 0.  Otherwise, it exits with 1.
 #
 # The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
+# don't specify an explicit build system type.

-# Use $HOST_CC if defined. $CC may point to a cross-compiler
-if test x"$CC_FOR_BUILD" = x; then
-  if test x"$HOST_CC" != x; then
-    CC_FOR_BUILD="$HOST_CC"
-  else
-    if test x"$CC" != x; then
-      CC_FOR_BUILD="$CC"
-    else
-      CC_FOR_BUILD=cc
-    fi
-  fi
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
 fi


+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+	  if test $? = 0 ; then
+	     CC_FOR_BUILD="$c"; break
+	  fi
+	done
+	rm -f $dummy.c $dummy.o $dummy.rel
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -61,9 +123,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown

-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
-
 # Note: order is significant - the case branches are not exclusive.

 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -77,7 +136,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# object file format.
 	# Determine the machine/vendor (is the vendor relevant).
 	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-cbm ;;
+	    amiga) machine=m68k-unknown ;;
 	    arm32) machine=arm-unknown ;;
 	    atari*) machine=m68k-atari ;;
 	    sun3*) machine=m68k-sun ;;
@@ -87,7 +146,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
-	# The Operating System including object format.
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE}" in
+	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
 		then
@@ -97,6 +159,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		else
 		    os=netbsdelf
 		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
 	# The OS release
 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -173,7 +240,7 @@ EOF
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
+	echo m68k-unknown-sysv4
 	exit 0;;
    amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
@@ -205,7 +272,7 @@ EOF
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    SR2?01:HI-UX/MPP:*:*)
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -341,10 +408,13 @@ EOF
 EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm $dummy.c $dummy && exit 0
+	  && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
    Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -392,9 +462,17 @@ EOF
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
 	echo i386-ibm-aix
 	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
    *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		sed 's/^		//' << EOF >$dummy.c
@@ -408,7 +486,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
@@ -417,9 +495,9 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit 0 ;;
-    *:AIX:*:4)
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -427,7 +505,7 @@ EOF
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=4.${UNAME_RELEASE}
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 	exit 0 ;;
@@ -453,10 +531,28 @@ EOF
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+                        esac ;;
+                    esac
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
              sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
@@ -491,11 +587,16 @@ EOF
              }
 EOF
 	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 	rm -f $dummy.c $dummy
+	fi ;;
 	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
    3050*:HI-UX:*:*)
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
@@ -522,7 +623,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
@@ -541,7 +642,7 @@ EOF
    hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
 	exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
@@ -586,27 +687,28 @@ EOF
    CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3E:*:*:*)
+    CRAY*T3D:*:*:*)
 	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
    CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    CRAY-2:*:*:*)
 	echo cray2-cray-unicos
        exit 0 ;;
-    F300:UNIX_System_V:*:*)
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
        exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    sparc*:BSD/OS:*:*)
@@ -627,6 +729,9 @@ EOF
    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -645,56 +750,39 @@ EOF
    *:GNU:*:*)
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
-    *:Linux:*:*)
-
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	ld_help_string=`cd /; ld --help 2>&1`
-	ld_supported_emulations=`echo $ld_help_string \
-			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_emulations" in
-	  *ia64)
-		echo "${UNAME_MACHINE}-unknown-linux"
-		exit 0
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+int main (int argc, char *argv[]) {
+#else
+int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	;;
-	  i?86linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0
-		;;
-	  elf_i?86)
-		echo "${UNAME_MACHINE}-pc-linux"
-		exit 0
-		;;
-	  i?86coff)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0
-		;;
-	  sparclinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  armlinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32arm*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
-		exit 0
-		;;
-	  armelf_linux*)
-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
-		exit 0
-		;;
-	  m68klinux)
-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
-		exit 0
-		;;
-	  elf32ppc | elf32ppclinux)
+    ppc:Linux:*:*)
 	# Determine Lib Version
 	cat >$dummy.c <<EOF
 #include <features.h>
@@ -709,7 +797,7 @@ main(argc, argv)
 #if defined(__GLIBC__)
  printf("%s %s\n", __libc_version, __libc_release);
 #else
-  printf("unkown\n");
+  printf("unknown\n");
 #endif
  return 0;
 }
@@ -718,22 +806,16 @@ EOF
 	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		./$dummy | grep 1\.99 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
+		if test "$?" = 0 ; then LIBC="libc1" ; fi
 	fi
 	rm -f $dummy.c $dummy
 	echo powerpc-unknown-linux-gnu${LIBC}
-		exit 0
-		;;
-	esac
-
-	if test "${UNAME_MACHINE}" = "alpha" ; then
+	exit 0 ;;
+    alpha:Linux:*:*)
 	cat <<EOF >$dummy.s
 	  .data
 	  \$Lformat:
 		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
 	   .text
 		.globl main
 		.align 4
@@ -758,26 +840,13 @@ EOF
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
 		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
+		0-0)	UNAME_MACHINE="alpha" ;;
+		1-0)	UNAME_MACHINE="alphaev5" ;;
+		1-1)    UNAME_MACHINE="alphaev56" ;;
+		1-101)	UNAME_MACHINE="alphapca56" ;;
+		2-303)	UNAME_MACHINE="alphaev6" ;;
+		2-307)	UNAME_MACHINE="alphaev67" ;;
 		esac
-
 		objdump --private-headers $dummy | \
 		  grep ld.so.1 > /dev/null
 		if test "$?" = 0 ; then
@@ -785,39 +854,62 @@ EOF
 		fi
 	fi
 	rm -f $dummy.s $dummy
-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
-	  rm -f $dummy.c $dummy
-	elif test "${UNAME_MACHINE}" = "s390"; then
-	  echo s390-ibm-linux && exit 0
-	else
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_supported_emulations=`cd /; ld --help 2>&1 \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i*86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  elf_i*86)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  i*86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	esac
 	# Either a pre-BFD a.out linker (linux-gnuoldld)
 	# or one that does not give us useful --help.
 	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
 	# If ld does not provide *any* "supported emulations:"
 	# that means it is gnuoldld.
-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
+	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 	case "${UNAME_MACHINE}" in
-	  i?86)
+	i*86)
 	  VENDOR=pc;
 	  ;;
 	*)
@@ -849,15 +941,16 @@ EOF
  return 0;
 }
 EOF
-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
-	fi ;;
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+    i*86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
        # Unixware is an offshoot of SVR4, but it has its own version
        # number series starting with 2...
        # I am not positive that other SVR4 systems won't match this,
@@ -865,7 +958,7 @@ EOF
        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -873,7 +966,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i?86:*:5:7*)
+    i*86:*:5:7*)
        # Fixed at (any) Pentium or better
        UNAME_MACHINE=i586
        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
@@ -882,7 +975,7 @@ EOF
 	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 	fi
 	exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -900,7 +993,7 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 	exit 0 ;;
    pc:*:*:*)
@@ -928,7 +1021,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -939,21 +1032,24 @@ EOF
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
    TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+    rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
@@ -987,7 +1083,7 @@ EOF
    mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
-    news*:NEWS-OS:*:6*)
+    news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
 	exit 0 ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@ -1030,15 +1126,52 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-W:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
    BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
 	exit 0 ;;
    DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1130,11 +1263,24 @@ main ()
 #endif

 #if defined (vax)
-#if !defined (ultrix)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
      printf ("vax-dec-bsd\n"); exit (0);
-#else
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
    printf ("vax-dec-ultrix\n"); exit (0);
-#endif
+# endif
 #endif

 #if defined (alliant) && defined (i860)
@@ -1145,7 +1291,7 @@ main ()
 }
 EOF

-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy

 # Apollos put the system type in the environment.
@@ -1178,6 +1324,48 @@ then
    esac
 fi

-#echo '(Unable to guess system type)' 1>&2
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF

 exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,10 @@
 #! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-#
+
+timestamp='2001-04-20'
+
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -27,7 +29,6 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# Written by Per Bothner <bothner@cygnus.com>.
 # Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -50,30 +51,73 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.

-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;

-# First pass through any local machine types.
-case $1 in
    *local*)
+       # First pass through any local machine types.
       echo $1
-		exit 0
-		;;
-	*)
-	;;
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
 esac

 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -99,7 +143,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -171,30 +215,40 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+		| pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
 		| hppa64 \
 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
 		| alphaev6[78] \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+		| we32k | ns16k | clipper | i370 | sh | sh[34] \
+		| powerpc | powerpcle \
+		| 1750a | dsp16xx | pdp10 | pdp11 \
+		| mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v | fr30 | avr)
+		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
+		| v850 | c4x \
+		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+		| pj | pjl | h8500)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
 		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
+	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -204,27 +258,30 @@ case $basic_machine in
 		;;
 	# Recognize the basic CPU types with company name.
 	# FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
+	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
 	      | hppa2.0n-* | hppa64-* \
 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
 	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+	      | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
+	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
+	      | [cjt]90-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
-	      | bs2000-*)
+	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
+	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -261,14 +318,14 @@ case $basic_machine in
 		os=-sysv
 		;;
 	amiga | amiga-*)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
-		basic_machine=m68k-cbm
+		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
@@ -315,13 +372,16 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -369,6 +429,10 @@ case $basic_machine in
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
@@ -444,19 +508,19 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[34567]86v4*)
+	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[34567]86v)
+	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[34567]86sol2)
+	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -468,14 +532,6 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
-	i386-go32 | go32)
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -501,6 +557,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -531,7 +591,7 @@ case $basic_machine in
 		os=-coff
 		;;
 	msdos)
-		basic_machine=i386-unknown
+		basic_machine=i386-pc
 		os=-msdos
 		;;
 	mvs)
@@ -595,6 +655,10 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -630,28 +694,28 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexen)
+	pentium | p5 | k5 | k6 | nexgen)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
-		basic_machine=i786-pc
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-* | 6x86-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
-	power)	basic_machine=rs6000-ibm
+	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
 	        ;;
@@ -666,6 +730,10 @@ case $basic_machine in
 	ps2)
 		basic_machine=i386-ibm
 		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -757,6 +825,10 @@ case $basic_machine in
 		basic_machine=t3e-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -852,13 +924,20 @@ case $basic_machine in
 	vax)
 		basic_machine=vax-dec
 		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sparc | sparcv9)
+	sh3 | sh4)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
        cydra)
@@ -880,6 +959,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
@@ -939,12 +1021,13 @@ case $os in
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
-		    x86-* | i[34567]86-*)
+		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
@@ -1000,7 +1083,7 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
-	-nsk)
+	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
@@ -1037,7 +1120,7 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -*MiNT)
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 	        os=-mint
 		;;
 	-none)
@@ -1071,6 +1154,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+	pdp10-*)
+		os=-tops20
+		;;
        pdp11-*)
 		os=-none
 		;;
@@ -1179,7 +1265,7 @@ case $basic_machine in
 	*-masscomp)
 		os=-rtu
 		;;
-	f301-fujitsu)
+	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
@@ -1257,7 +1343,7 @@ case $basic_machine in
 			-mpw* | -macos*)
 				vendor=apple
 				;;
-			-*mint | -*MiNT)
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
 		esac
@@ -1266,3 +1352,11 @@ case $basic_machine in
 esac

 echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
--- a/configure.in
+++ b/configure.in
@@ -1,27 +1,45 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lib/urldata.h)
+AC_INIT
+AC_CONFIG_SRCDIR([lib/urldata.h])
 AM_CONFIG_HEADER(config.h src/config.h)

 VERSION=`sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curl.h`
 AM_INIT_AUTOMAKE(curl,$VERSION)
-AM_PROG_LIBTOOL
+
+dnl
+dnl we extract the numerical version for curl-config only
+VERSIONNUM=`sed -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curl.h`
+AC_SUBST(VERSIONNUM)
+
+dnl Solaris pkgadd support definitions
+PKGADD_PKG="HAXXcurl"
+PKGADD_NAME="cURL - a client that groks URLs"
+PKGADD_VENDOR="curl.haxx.se"
+AC_SUBST(PKGADD_PKG)
+AC_SUBST(PKGADD_NAME)
+AC_SUBST(PKGADD_VENDOR)
+

 dnl
 dnl Detect the canonical host and target build environment
 dnl
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET

-dnl Checks for programs.
-AC_PROG_CC
+AC_CANONICAL_HOST
+dnl Get system canonical name
+AC_DEFINE_UNQUOTED(OS, "${host}")

 dnl Check for AIX weirdos
 AC_AIX

+dnl Checks for programs.
+AC_PROG_CC
+
 dnl check for how to do large files
 AC_SYS_LARGEFILE

+AM_PROG_LIBTOOL
+
 dnl The install stuff has already been taken care of by the automake stuff
 dnl AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -522,6 +540,7 @@ else
  AC_MSG_RESULT(no)
 fi

+
 dnl **********************************************************************
 dnl Check for the presence of SSL libraries and headers
 dnl **********************************************************************
@@ -539,26 +558,36 @@ then
  AC_MSG_WARN(SSL/https support disabled)  
 else

-  dnl Check for & handle argument to --with-ssl.
+  dnl Check for and handle argument to --with-ssl.
+  EXTRA_SSL=

-  AC_MSG_CHECKING(where to look for SSL)
-  if test X"$OPT_SSL" = Xoff
-  then
-  	AC_MSG_RESULT([defaults (or given in environment)])
-  else
-	test X"$OPT_SSL" = Xyes && OPT_SSL=/usr/local/ssl
-        dnl	LIBS="$LIBS -L$OPT_SSL/lib"
-        LDFLAGS="$LDFLAGS -L$OPT_SSL/lib"
-	CPPFLAGS="$CPPFLAGS -I$OPT_SSL/include/openssl -I$OPT_SSL/include"
-	AC_MSG_RESULT([$OPT_SSL])
-  fi
+  case "$OPT_SSL" in
+  yes)
+    EXTRA_SSL=/usr/local/ssl ;;
+  *)
+    EXTRA_SSL=$OPT_SSL ;;
+  esac

-  dnl check for crypto libs (part of SSLeay)
-  AC_CHECK_LIB(crypto, CRYPTO_lock)
+  AC_CHECK_LIB(crypto, CRYPTO_lock,[
+     HAVECRYPTO="yes"
+     ],[
+     OLDLDFLAGS="$LDFLAGS"
+     OLDCPPFLAGS="$CPPFLAGS"
+     LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
+     CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+     AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
+       HAVECRYPTO="yes" ], [
+       LDFLAGS="$OLDLDFLAGS"
+       CPPFLAGS="$OLDCPPFLAGS"
+       ])
+    ])

-  if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
+
+  if test "$HAVECRYPTO" = "yes"; then
    dnl This is only reasonable to do if crypto actually is there: check for
    dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
+
+    AC_CHECK_LIB(crypto, CRYPTO_add_lock)
    AC_CHECK_LIB(ssl, SSL_connect)

    if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
@@ -577,35 +606,14 @@ else
    fi


-
    dnl Check for SSLeay headers
    AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \
-                     openssl/pem.h openssl/ssl.h openssl/err.h)
+                     openssl/pem.h openssl/ssl.h openssl/err.h,
+      OPENSSL_ENABLED=1)

    if test $ac_cv_header_openssl_x509_h = no; then
-      AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h)
-    fi
-
-    dnl
-    dnl If all heades are present, we have enabled SSL!
-    if test "$ac_cv_header_openssl_x509_h" = "yes" &&
-       test "$ac_cv_header_openssl_rsa_h" = "yes" &&
-       test "$ac_cv_header_openssl_crypto_h" = "yes" &&
-       test "$ac_cv_header_openssl_pem_h" = "yes" &&
-       test "$ac_cv_header_openssl_ssl_h" = "yes" &&
-       test "$ac_cv_header_openssl_err_h" = "yes"; then
-      OPENSSL_ENABLED="1";
-    fi
-
-    dnl
-    dnl Check the alternative headers too
-    if test "$ac_cv_header_x509_h" = "yes" &&
-       test "$ac_cv_header_rsa_h" = "yes" &&
-       test "$ac_cv_header_crypto_h" = "yes" &&
-       test "$ac_cv_header_pem_h" = "yes" &&
-       test "$ac_cv_header_ssl_h" = "yes" &&
-       test "$ac_cv_header_err_h" = "yes"; then
-      OPENSSL_ENABLED="1";
+      AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h,
+        OPENSSL_ENABLED=1)
    fi

    AC_SUBST(OPENSSL_ENABLED)
@@ -761,11 +769,6 @@ if test "$socklen_t" != "yes"; then
  AC_CHECK_TYPE(socklen_t, int)
 fi

-
-dnl Get system canonical name
-AC_CANONICAL_HOST
-AC_DEFINE_UNQUOTED(OS, "${host}")
-
 dnl Checks for library functions.
 dnl AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
@@ -774,6 +777,7 @@ AC_CHECK_FUNCS( socket \
                select \
                strdup \
                strstr \
+                strtok_r \
                strftime \
                uname \
                strcasecmp \
@@ -821,7 +825,7 @@ dnl AC_PATH_PROG( RANLIB, ranlib, /usr/bin/ranlib,
 dnl   $PATH:/usr/bin/:/usr/local/bin )
 dnl AC_SUBST(RANLIB)

-AC_OUTPUT( Makefile \
+AC_CONFIG_FILES([Makefile \
 	   docs/Makefile \
           docs/examples/Makefile \
 	   include/Makefile \
@@ -836,10 +840,12 @@ AC_OUTPUT( Makefile \
 	   packages/Linux/RPM/Makefile \
 	   packages/Linux/RPM/curl.spec \
 	   packages/Linux/RPM/curl-ssl.spec \
+           packages/Solaris/Makefile \
           perl/Makefile \
           perl/Curl_easy/Makefile \
           php/Makefile \
           php/examples/Makefile \
           curl-config
-)
+])
+AC_OUTPUT

--- a/curl-config.in
+++ b/curl-config.in
@@ -62,6 +62,11 @@ while test $# -gt 0; do
 	exit 0
 	;;

+    --vernum)
+	echo @VERSIONNUM@
+	exit 0
+	;;
+
    --help)
 	usage 0
 	;;
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: April 22, 2001 (http://curl.haxx.se/docs/faq.shtml)
+Updated: May 29, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -34,6 +34,7 @@ FAQ
  3.8 How do I tell curl to follow HTTP redirects?
  3.9 How do I use curl in PHP, Perl, Tcl, Ruby or Java?
  3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
+  3.11 How do I POST with a different Content-Type?

 4. Running Problems
  4.1 Problems connecting to SSL servers.
@@ -319,7 +320,7 @@ FAQ

  At the time of writing, there are bindings for the five language mentioned
  above, but chances are there are even more by the time you read this. Or you
-  may be able you write your own wrapper for a not-yet support language!
+  may be able you write your own wrapper for a not-yet supported language!

  Find out more about which languages that support curl directly, and how to
  install and use them, in the libcurl section of the curl web site:
@@ -347,6 +348,13 @@ FAQ
  Using libcurl or PHP's curl modules is just as fine and you'd just use the
  proper library options to do the same.

+  3.11 How do I POST with a different Content-Type?
+
+  You can always replace the internally generated headers with -H/--header.
+  To make a simple HTTP POST with text/xml as content-type, do something like:
+
+        curl -d "datatopost" -H "Content-Type: text/xml" [URL]
+
 4. Running Problems

  4.1. Problems connecting to SSL servers.
@@ -497,6 +505,8 @@ FAQ

  5.2 How can I receive all data into a large memory chunk?

+  [ See also the examples/getinmemory.c source ]
+
  You are in full control of the callback function that gets called every time
  there is data received from the remote server. You can make that callback do
  whatever you want. You do not have to write the received data to a file.
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -1,4 +1,4 @@
-                                       Updated for curl 7.7.2 on April 26, 2001
+                                       Updated for curl 7.8 on May 29, 2001
                                  _   _ ____  _     
                              ___| | | |  _ \| |    
                             / __| | | | |_) | |    
@@ -69,20 +69,29 @@ Library
 rather small and easy-to-follow. All the ones prefixed with 'curl_easy' are
 put in the lib/easy.c file.

+ Starting with libcurl 7.8, curl_global_init_() and curl_global_cleanup() were
+ introduced. They should be called by the application to initialize and clean
+ up global stuff in the library. As of today, they just do the global SSL
+ initing if SSL is enabled. libcurl itself has no "global" scope.
+
 All printf()-style functions use the supplied clones in lib/mprintf.c. This
 makes sure we stay absolutely platform independent.

 curl_easy_init() allocates an internal struct and makes some initializations.
- The returned handle does not reveal internals.
+ The returned handle does not reveal internals. This is the 'UrlData' struct
+ which works as a global "anchor" struct. All connections performed will get
+ connect-specific data allocated that should be used for things related to
+ particular connections/requests.

- curl_easy_setopt() takes a three arguments, where the option stuff must be
- passed in pairs, the parameter-ID and the parameter-value. The list of
- options is documented in the man page.
+ curl_easy_setopt() takes three arguments, where the option stuff must be
+ passed in pairs: the parameter-ID and the parameter-value. The list of
+ options is documented in the man page. This function mainly sets things in
+ the 'UrlData' struct.

 curl_easy_perform() does a whole lot of things:

 It starts off in the lib/easy.c file by calling Curl_perform() and the main
- work then continues lib/url.c. The flow continues with a call to
+ work then continues in lib/url.c. The flow continues with a call to
 Curl_connect() to connect to the remote site.

 o Curl_connect()
@@ -94,12 +103,18 @@ Library
   When Curl_connect is done, we are connected to the remote site. Then it is
   time to tell the server to get a document/file. Curl_do() arranges this.

+   This function makes sure there's an allocated and initiated 'connectdata'
+   struct that is used for this particular connection only (although there may
+   be several requests performed on the same connect). A bunch of things are
+   inited/inherited from the UrlData struct.
+
 o Curl_do()

   Curl_do() makes sure the proper protocol-specific function is called. The
   functions are named after the protocols they handle. Curl_ftp(),
   Curl_http(), Curl_dict(), etc. They all reside in their respective files
-   (ftp.c, http.c and dict.c).
+   (ftp.c, http.c and dict.c). HTTPS is handled by Curl_http() and FTPS by
+   Curl_ftp().

   The protocol-specific functions of course deal with protocol-specific
   negotiations and setup. They have access to the Curl_sendf() (from
@@ -123,17 +138,18 @@ Library
   Called after a transfer is done. This function takes care of everything
   that has to be done after a transfer. This function attempts to leave
   matters in a state so that Curl_do() should be possible to call again on
-   the same connection (in a persistent connection case). It may also soon be
-   closed with Curl_disconnect().
+   the same connection (in a persistent connection case). It might also soon
+   be closed with Curl_disconnect().

 o Curl_disconnect()

-   During normal connection and transfers, no one ever tries to close any
+   When doing normal connections and transfers, no one ever tries to close any
   connection so this is not normally called when curl_easy_perform() is
   used. This function is only used when we are certain that no more transfers
-   is going to be made on the connection (it can be also closed by
-   force). This function can also be called at times to make sure that libcurl
-   doesn't keep too many connections alive at the same time.
+   is going to be made on the connection. It can be also closed by force, or
+   it can be called to make sure that libcurl doesn't keep too many
+   connections alive at the same time (there's a default amount of 5 but that
+   can be changed with the CURLOPT_MAXCONNECTS option).

   This function cleans up all resources that are associated with a single
   connection.
@@ -239,26 +255,26 @@ Library
 Persistent Connections
 ======================

- With curl 7.7, we added persistent connection support to libcurl which has
- introduced a somewhat different treatmeant of things inside of libcurl.
+ The persistent connection support in libcurl requires some considerations on
+ how to do things inside of the library.

 o The 'UrlData' struct returned in the curl_easy_init() call must never
   hold connection-oriented data. It is meant to hold the root data as well
   as all the options etc that the library-user may choose.
- o The 'UrlData' struct holds the cache array of pointers to 'connectdata'
-   structs. There's one connectdata struct for each connection that libcurl
-   knows about.
+ o The 'UrlData' struct holds the "connection cache" (an array of pointers to
+   'connectdata' structs). There's one connectdata struct allocated for each
+   connection that libcurl knows about.
 o This also enables the 'curl handle' to be reused on subsequent transfers,
-   something that was illegal in pre-7.7 versions.
+   something that was illegal before libcurl 7.7.
 o When we are about to perform a transfer with curl_easy_perform(), we first
   check for an already existing connection in the cache that we can use,
   otherwise we create a new one and add to the cache. If the cache is full
   already when we add a new connection, we close one of the present ones. We
   select which one to close dependent on the close policy that may have been
   previously set.
- o When the tranfer operation is complete, we try to leave the connection open.
-   Particular options may tell us not to, and protocols may signal closure on
-   connections and then we don't keep it open of course.
+ o When the transfer operation is complete, we try to leave the connection
+   open. Particular options may tell us not to, and protocols may signal
+   closure on connections and then we don't keep it open of course.
 o When curl_easy_cleanup() is called, we close all still opened connections.

 You do realize that the curl handle must be re-used in order for the
@@ -268,10 +284,9 @@ Library Symbols
 ===============
 
 All symbols used internally in libcurl must use a 'Curl_' prefix if they're
- used in more than a single file. Single-file symbols must be made
- static. Public (exported) symbols must use a 'curl_' prefix. (There are
- exceptions, but they are destined to be changed to follow this pattern in the
- future.)
+ used in more than a single file. Single-file symbols must be made static.
+ Public ("exported") symbols must use a 'curl_' prefix. (There are exceptions,
+ but they are to be changed to follow this pattern in future versions.)

 Return Codes and Informationals
 ===============================
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -24,10 +24,12 @@ man_MANS = \
 	curl_strequal.3 \
 	curl_strnequal.3 \
 	curl_mprintf.3 \
+	curl_global_init.3 \
+	curl_global_cleanup.3 \
 	libcurl.5

 EXTRA_DIST = $(man_MANS) \
 	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \
-	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting
+	LIBCURL README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS

 SUBDIRS = examples
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -0,0 +1,71 @@
+This project has been alive for several years. Countless people have provided
+feedback that have improved curl. Here follows a (incomplete) list of people
+that have contributed with non-trivial parts:
+
+ - Daniel Stenberg <daniel@haxx.se>
+ - Rafael Sagula <sagula@inf.ufrgs.br>
+ - Sampo Kellomaki <sampo@iki.fi>
+ - Linas Vepstas <linas@linas.org>
+ - Bjorn Reese <breese@mail1.stofanet.dk>
+ - Johan Anderson <johan@homemail.com>
+ - Kjell Ericson <Kjell.Ericson@haxx.se>
+ - Troy Engel <tengel@sonic.net>
+ - Ryan Nelson <ryan@inch.com>
+ - Bj<42>rn Stenberg <bjorn@haxx.se>
+ - Angus Mackay <amackay@gus.ml.org>
+ - Eric Young <eay@cryptsoft.com>
+ - Simon Dick <simond@totally.irrelevant.org>
+ - Oren Tirosh <oren@monty.hishome.net>
+ - Steven G. Johnson <stevenj@alum.mit.edu>
+ - Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
+ - Andr<64>s Garc<72>a <ornalux@redestb.es>
+ - Douglas E. Wegscheid <wegscd@whirlpool.com>
+ - Mark Butler <butlerm@xmission.com>
+ - Eric Thelin <eric@generation-i.com>
+ - Marc Boucher <marc@mbsi.ca>
+ - Greg Onufer <Greg.Onufer@Eng.Sun.COM>
+ - Doug Kaufman <dkaufman@rahul.net>
+ - David Eriksson <david@2good.com>
+ - Ralph Beckmann <rabe@uni-paderborn.de>
+ - T. Yamada <tai@imasy.or.jp>
+ - Lars J. Aas <larsa@sim.no>
+ - J<>rn Hartroth <Joern.Hartroth@computer.org>
+ - Matthew Clarke <clamat@van.maves.ca>
+ - Linus Nielsen Feltzing <linus@haxx.se>
+ - Felix von Leitner <felix@convergence.de>
+ - Dan Zitter <dzitter@zitter.net>
+ - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
+ - Chris Maltby <chris@aurema.com>
+ - Ron Zapp <rzapper@yahoo.com>
+ - Paul Marquis <pmarquis@iname.com>
+ - Ellis Pritchard <ellis@citria.com>
+ - Damien Adant <dams@usa.net>
+ - Chris <cbayliss@csc.come>
+ - Marco G. Salvagno <mgs@whiz.cjb.net>
+ - Paul Marquis <pmarquis@iname.com>
+ - David LeBlanc <dleblanc@qnx.com>
+ - Rich Gray at Plus Technologies
+ - Luong Dinh Dung <u8luong@lhsystems.hu>
+ - Torsten Foertsch <torsten.foertsch@gmx.net>
+ - Kristian K<>hntopp <kris@koehntopp.de>
+ - Fred Noz <FNoz@siac.com>
+ - Caolan McNamara <caolan@csn.ul.ie>
+ - Albert Chin-A-Young <china@thewrittenword.com>
+ - Stephen Kick <skick@epicrealm.com>
+ - Martin Hedenfalk <mhe@stacken.kth.se>
+ - Richard Prescott
+ - Jason S. Priebe <priebe@wral-tv.com>
+ - T. Bharath <TBharath@responsenetworks.com>
+ - Alexander Kourakos <awk@users.sourceforge.net>
+ - James Griffiths <griffiths_james@yahoo.com>
+ - Loic Dachary <loic@senga.org>
+ - Robert Weaver <robert.weaver@sabre.com>
+ - Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
+ - Jun-ichiro itojun Hagino <itojun@iijlab.net>
+ - Frederic Lepied <flepied@mandrakesoft.com>
+ - Georg Horn <horn@koblenz-net.de>
+ - Cris Bailiff <c.bailiff@awayweb.com>
+ - Sterling Hughes <sterling@designmultimedia.com>
+ - S. Moonesamy
+ - Ingo Wilken <iw@WWW.Ecce-Terram.DE>
+ - Pawel A. Gajda <mis@k2.net.pl>
--- a/docs/TODO
+++ b/docs/TODO
@@ -9,16 +9,13 @@ TODO
 Things to do in project cURL. Please tell me what you think, contribute and
 send me patches that improve things!

-To do for the next release:
-
- * Make sure SSL works even when IPv6 is enabled. We just can't connect to
-   IPv6 sites and use SSL, but we should detect that particular condition
-   and warn about it.
+To do in a future release (random order):

 * Make SSL session ids get used if multiple HTTPS documents from the same
-   host is requested.
+   host is requested. Note: is this really prioritized now with the persistent
+   connections?

-To do in a future release (random order):
+ * Suggested on the mailing list: CURLOPT_FTP_MKDIR...!

 * Rewrite parts of the test suite. Make a (XML?) format to store all
   test-data in a single for a single test case. The current system makes far
@@ -30,9 +27,8 @@ To do in a future release (random order):
   decrease footprint.  '--disable-[protocol]' where protocol is http, ftp,
   telnet, ldap, dict or file.

- * Extend the test suite to include telnet and https. The telnet could just do
-   ftp or http operations (for which we have test servers) and the https would
-   probably work against/with some of the openssl tools.
+ * Extend the test suite to include telnet. The telnet could just do ftp or
+   http operations (for which we have test servers).

 * Add a command line option that allows the output file to get the same time
   stamp as the remote file. libcurl already is capable of fetching the remote
@@ -46,14 +42,10 @@ To do in a future release (random order):
 * Add asynchronous name resolving, as this enables full timeout support for
   fork() systems.

- * Non-blocking connect(), also to make timeouts work on windows.
-
 * Move non-URL related functions that are used by both the lib and the curl
   application to a separate "portability lib".

- * Add support for other languages than C.  C++ (rumours have been heard about
-   something being worked on in this area) and perl (we have seen the first
-   versions of this!) comes to mind. Python anyone?
+ * Add libcurl support/interfaces for more languages. C++ wrapper perhaps?

 * "Content-Encoding: compress/gzip/zlib" HTTP 1.1 clearly defines how to get
   and decode compressed documents. There is the zlib that is pretty good at
@@ -85,8 +77,7 @@ To do in a future release (random order):
 * Other proxies
   Ftp-kind proxy, Socks5, whatever kind of proxies are there?

- * IPv6 Awareness and support. (This is partly done.)  RFC 2428 "FTP
+ * Full IPv6 Awareness and support. (This is partly done.)  RFC 2428 "FTP
   Extensions for IPv6 and NATs" is interesting. PORT should be replaced with
-   EPRT for IPv6 (done), and EPSV instead of PASV.  HTTP proxies are left to
-   add support for.
+   EPRT for IPv6 (done), and EPSV instead of PASV.

--- a/docs/curl-config.1
+++ b/docs/curl-config.1
@@ -2,7 +2,7 @@
 .\" nroff -man curl-config.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl-config 1 "18 March 2001" "Curl 7.7.2" "curl-config manual"
+.TH curl-config 1 "28 May 2001" "Curl 7.8" "curl-config manual"
 .SH NAME
 curl-config \- Get information about a libcurl installation
 .SH SYNOPSIS
@@ -30,6 +30,11 @@ in $prefix/lib and its header files are installed in $prefix/include and so
 on. The prefix is set with "configure --prefix".
 .IP "--version"
 Outputs version information about the installed libcurl.
+.IP "--vernum"
+Outputs version information about the installed libcurl, in numerical mode.
+This outputs the version number, in hexadecimal, with 8 bits for each part;
+major, minor, patch. So that libcurl 7.7.4 would appear as 070704 and libcurl
+12.13.14 would appear as 0c0d0e...
 .SH "EXAMPLES"
 What is the path to the curl header files?

--- a/docs/curl.1
+++ b/docs/curl.1
@@ -2,7 +2,7 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "20 April 2001" "Curl 7.7.2" "Curl Manual"
+.TH curl 1 "8 May 2001" "Curl 7.7.3" "Curl Manual"
 .SH NAME
 curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
 HTTPS syntax.
@@ -39,14 +39,14 @@ supported at the moment:

 http://www.any.org/archive[1996-1999]/volume[1-4]part{a,b,c,index}.html

-Starting with curl 7.6, you can specify any amount of URLs on the command
-line. They will be fetched in a sequential manner in the specified order.
+You can specify any amount of URLs on the command line. They will be fetched
+in a sequential manner in the specified order.

-Starting with curl 7.7, curl will attempt to re-use connections for multiple
-file transfers, so that getting many files from the same server will not do
-multiple connects/handshakes. This improves speed. Of course this is only done
-on files specified on a single command line and cannot be used between
-separate curl invokes.
+Curl will attempt to re-use connections for multiple file transfers, so that
+getting many files from the same server will not do multiple connects /
+handshakes. This improves speed. Of course this is only done on files
+specified on a single command line and cannot be used between separate curl
+invokes.
 .SH OPTIONS
 .IP "-a/--append"
 (FTP)
@@ -62,7 +62,7 @@ fail if its not set to "Mozilla/4.0".  To encode blanks in the string,
 surround the string with single quote marks.  This can also be set with the
 -H/--header flag of course.

-If this option is used more than once, the last one will be the one to be
+If this option is set more than once, the last one will be the one that's
 used.
 .IP "-b/--cookie <name=data>"
 (HTTP)
@@ -72,18 +72,18 @@ The data should be in the format "NAME1=VALUE1; NAME2=VALUE2".

 If no '=' letter is used in the line, it is treated as a filename to use to
 read previously stored cookie lines from, which should be used in this session
-if they match. Using this method also activates the "cookie parser" which
-will make curl record incoming cookies too, which may be handy if you're using
-this in combination with the -L/--location option. The file format of the file
-to read cookies from should be plain HTTP headers or the netscape cookie file
-format.
+if they match. Using this method also activates the "cookie parser" which will
+make curl record incoming cookies too, which may be handy if you're using this
+in combination with the -L/--location option. The file format of the file to
+read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie
+file format.

 .B NOTE
 that the file specified with -b/--cookie is only used as input. No cookies
 will be stored in the file. To store cookies, save the HTTP headers to a file
 using -D/--dump-header!

-If this option is used more than once, the last one will be the one to be
+If this option is set more than once, the last one will be the one that's
 used.
 .IP "-B/--use-ascii"
 Use ASCII transfer when getting an FTP file or LDAP info. For FTP, this can
@@ -756,78 +756,18 @@ Interface error. A specified outgoing interface could not be used.
 Bad password entered. An error was signalled when the password was entered.
 .IP 47
 Too many redirects. When following redirects, curl hit the maximum amount.
+.IP 48
+Unknown TELNET option specified.
+.IP 49
+Malformed telnet option.
 .IP XX
 There will appear more error codes here in future releases. The existing ones
 are meant to never change.
 .SH BUGS
 If you do find bugs, mail them to curl-bug@haxx.se.
 .SH AUTHORS / CONTRIBUTORS
- - Daniel Stenberg <Daniel.Stenberg@haxx.se>
- - Rafael Sagula <sagula@inf.ufrgs.br>
- - Sampo Kellomaki <sampo@iki.fi>
- - Linas Vepstas <linas@linas.org>
- - Bjorn Reese <breese@mail1.stofanet.dk>
- - Johan Anderson <johan@homemail.com>
- - Kjell Ericson <Kjell.Ericson@haxx.se>
- - Troy Engel <tengel@sonic.net>
- - Ryan Nelson <ryan@inch.com>
- - Bj<42>rn Stenberg <Bjorn.Stenberg@haxx.se>
- - Angus Mackay <amackay@gus.ml.org>
- - Eric Young <eay@cryptsoft.com>
- - Simon Dick <simond@totally.irrelevant.org>
- - Oren Tirosh <oren@monty.hishome.net>
- - Steven G. Johnson <stevenj@alum.mit.edu>
- - Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
- - Andr<64>s Garc<72>a <ornalux@redestb.es>
- - Douglas E. Wegscheid <wegscd@whirlpool.com>
- - Mark Butler <butlerm@xmission.com>
- - Eric Thelin <eric@generation-i.com>
- - Marc Boucher <marc@mbsi.ca>
- - Greg Onufer <Greg.Onufer@Eng.Sun.COM>
- - Doug Kaufman <dkaufman@rahul.net>
- - David Eriksson <david@2good.com>
- - Ralph Beckmann <rabe@uni-paderborn.de>
- - T. Yamada <tai@imasy.or.jp>
- - Lars J. Aas <larsa@sim.no>
- - J<>rn Hartroth <Joern.Hartroth@computer.org>
- - Matthew Clarke <clamat@van.maves.ca>
- - Linus Nielsen Feltzing <linus@haxx.se>
- - Felix von Leitner <felix@convergence.de>
- - Dan Zitter <dzitter@zitter.net>
- - Jongki Suwandi <Jongki.Suwandi@eng.sun.com>
- - Chris Maltby <chris@aurema.com>
- - Ron Zapp <rzapper@yahoo.com>
- - Paul Marquis <pmarquis@iname.com>
- - Ellis Pritchard <ellis@citria.com>
- - Damien Adant <dams@usa.net>
- - Chris <cbayliss@csc.come>
- - Marco G. Salvagno <mgs@whiz.cjb.net>
- - Paul Marquis <pmarquis@iname.com>
- - David LeBlanc <dleblanc@qnx.com>
- - Rich Gray at Plus Technologies
- - Luong Dinh Dung <u8luong@lhsystems.hu>
- - Torsten Foertsch <torsten.foertsch@gmx.net>
- - Kristian K<>hntopp <kris@koehntopp.de>
- - Fred Noz <FNoz@siac.com>
- - Caolan McNamara <caolan@csn.ul.ie>
- - Albert Chin-A-Young <china@thewrittenword.com>
- - Stephen Kick <skick@epicrealm.com>
- - Martin Hedenfalk <mhe@stacken.kth.se>
- - Richard Prescott
- - Jason S. Priebe <priebe@wral-tv.com>
- - T. Bharath <TBharath@responsenetworks.com>
- - Alexander Kourakos <awk@users.sourceforge.net>
- - James Griffiths <griffiths_james@yahoo.com>
- - Loic Dachary <loic@senga.org>
- - Robert Weaver <robert.weaver@sabre.com>
- - Ingo Ralf Blum <ingoralfblum@ingoralfblum.com>
- - Jun-ichiro itojun Hagino <itojun@iijlab.net>
- - Frederic Lepied <flepied@mandrakesoft.com>
- - Georg Horn <horn@koblenz-net.de>
- - Cris Bailiff <c.bailiff@awayweb.com>
- - Sterling Hughes <sterling@designmultimedia.com>
- - S. Moonesamy
-
+Daniel Stenberg is the main author, but the whole list of contributors is
+found in the separate THANKS file.
 .SH WWW
 http://curl.haxx.se
 .SH FTP
--- a/docs/curl_easy_setopt.3
+++ b/docs/curl_easy_setopt.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
-.TH curl_easy_setopt 3 "10 April 2001" "libcurl 7.7.2" "libcurl Manual"
+.TH curl_easy_setopt 3 "29 May 2001" "libcurl 7.8" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - Set curl easy-session options
 .SH SYNOPSIS
@@ -109,7 +109,8 @@ this means, you probably don't want this tunnel option. (Added in libcurl 7.3)
 .TP
 .B CURLOPT_VERBOSE
 Set the parameter to non-zero to get the library to display a lot of verbose
-information about its operations.
+information about its operations. Very useful for libcurl and/or protocl
+debugging and understanding.
 .TP
 .B CURLOPT_HEADER
 A non-zero parameter tells the library to include the header in the
@@ -178,7 +179,10 @@ A non-zero parameter tells the library to use HTTP PUT a file. The file to put
 must be set with CURLOPT_INFILE and CURLOPT_INFILESIZE.
 .TP
 .B CURLOPT_MUTE
-A non-zero parameter tells the library to be completely quiet.
+A non-zero parameter tells the library to be completely quiet. This only
+affects error messages that occurs when there's no CURLOPT_ERRORBUFFER
+specified. If an error messaged is specifed, this option won't make any
+difference.
 .TP
 .B CURLOPT_USERPWD
 Pass a char * as parameter, which should be [username]:[password] to use for
@@ -276,7 +280,8 @@ of HTTP post structs as parameter.  The linked list should be a fully valid
 list of 'struct HttpPost' structs properly filled in. The best and most
 elegant way to do this, is to use
 .I curl_formparse(3)
-as documented.
+as documented. The data in this list must remained intact until you close this
+curl handle again with curl_easy_cleanup().
 .TP
 .B CURLOPT_SSLCERT
 Pass a pointer to a zero terminated string as parameter. The string should be
@@ -336,8 +341,9 @@ return code). (Added in libcurl 7.7.2)
 .TP
 .B CURLOPT_COOKIEFILE
 Pass a pointer to a zero terminated string as parameter. It should contain the
-name of your file holding cookie data. The cookie data may be in netscape
-cookie data format or just regular HTTP-style headers dumped to a file.
+name of your file holding cookie data. The cookie data may be in Netscape /
+Mozilla cookie data format or just regular HTTP-style headers dumped to a
+file.
 .TP
 .B CURLOPT_SSLVERSION
 Pass a long as parameter. Set what version of SSL to attempt to use, 2 or
--- a/docs/curl_formparse.3
+++ b/docs/curl_formparse.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
-.TH curl_formparse 3 "3 May 2001" "libcurl 7.7.2" "libcurl Manual"
+.TH curl_formparse 3 "21 May 2001" "libcurl 7.7.4" "libcurl Manual"
 .SH NAME
 curl_formparse - add a section to a multipart/formdata HTTP POST
 .SH SYNOPSIS
@@ -15,16 +15,21 @@ curl_formparse - add a section to a multipart/formdata HTTP POST
 curl_formparse() is used to append sections when building a multipart/formdata
 HTTP POST (sometimes refered to as rfc1867-style posts). Append one section at
 a time until you've added all the sections you want included and then you pass
-the \fI firstitem\fP pointer as parameter to \fBCURLOPT_HTTPPOST\fP.
+the \fIfirstitem\fP pointer as parameter to \fBCURLOPT_HTTPPOST\fP.
 \fIlastitem\fP is set after each call and on repeated invokes it should be
 left as set to allow repeated invokes to find the end of the list in a faster
 way.  \fIstring\fP must be a zero terminated string abiding to the syntax
 described in a section below

-The pointers \fIfirstitem\fP and \fIlastitem\fP point to, should both be
-pointers to NULL in the first call to this function. All list-data will be
-allocated by the function itself. You must call \fIcurl_formfree\fP after the
-form post has been done to free the resources again.
+The pointers \fI*firstitem\fP and \fI*lastitem\fP should both be pointing to
+NULL in the first call to this function. All list-data will be allocated by
+the function itself. You must call \fIcurl_formfree\fP after the form post has
+been done to free the resources again.
+
+This function will copy all input data and keep its own version of it
+allocated until you call \fIcurl_formfree\fP. When you've passed the pointer
+to \fIcurl_easy_setopt\fP, you must not free the list until after you've
+called \fIcurl_easy_cleanup\fP for the curl handle.

 See example below.
 .SH "FORM PARSE STRINGS"
@@ -73,7 +78,8 @@ Returns non-zero if an error occurs.
 curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);

 .SH "SEE ALSO"
-.BR curl_easy_setopt "(3) "
+.BR curl_easy_setopt "(3), "
+.BR curl_formfree "(3)
 .SH BUGS
 Surely there are some, you tell me!

--- a/docs/curl_global_cleanup.3
+++ b/docs/curl_global_cleanup.3
@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_global_cleanup 3 "28 May 2001" "libcurl 7.8" "libcurl Manual"
+.SH NAME
+curl_global_cleanup - Global libcurl cleanup
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "void curl_global_cleanup(void);"
+.ad
+.SH DESCRIPTION
+curl_global_cleanup must be called once (no matter how many threads or libcurl
+sessions that'll be used) by every application that uses libcurl, after all
+uses of libcurl is complete.
+
+This is the opposite of \fIcurl_global_init\fP.
+
+Not calling this function may result in memory leaks.
+
+This function was added in libcurl 7.8.
+.SH "SEE ALSO"
+.BR curl_global_init "(3), "
+.SH BUGS
+None?
+
--- a/docs/curl_global_init.3
+++ b/docs/curl_global_init.3
@@ -0,0 +1,34 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_global_init 3 "29 May 2001" "libcurl 7.8" "libcurl Manual"
+.SH NAME
+curl_global_init - Global libcurl initialisation
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "CURLcode curl_global_init(long " flags ");"
+.ad
+.SH DESCRIPTION
+This function should be called once (no matter how many threads or libcurl
+sessions that'll be used) by every application that uses libcurl.
+
+If this function hasn't been invoked when \fIcurl_easy_init\fP is called, it
+will be done automatically by libcurl.
+
+The flags option should be set to zero. It will be used to tell libcurl what
+specific features it should \fBnot\fP init.
+
+You must however \fBalways\fP use the \fIcurl_global_cleanup\fP function, as
+that cannot be called automatically for you by libcurl.
+
+This function was added in libcurl 7.8.
+.SH RETURN VALUE
+If this function returns non-zero, something went wrong and you cannot use the
+other curl functions.
+.SH "SEE ALSO"
+.BR curl_global_cleanup "(3), "
+.SH BUGS
+None.
+
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies

 EXTRA_DIST = README curlgtk.c sepheaders.c simple.c postit.c \
 	     win32sockets.c persistant.c ftpget.c Makefile.example \
-	     multithread.c
+	     multithread.c getinmemory.c

 all:
 	@echo "done"
--- a/docs/examples/Makefile.example
+++ b/docs/examples/Makefile.example
@@ -30,6 +30,7 @@ LDFLAGS = -L/home/dast/lib -L/usr/local/ssl/lib
 # We need -lsocket and -lnsl when on Solaris
 # We need -lssl and -lcrypto when using libcurl with SSL support
 # We need -ldl for dlopen() if that is in libdl
+# We need -lpthread for the pthread example
 LIBS = -lcurl -lsocket -lnsl -lssl -lcrypto -dl

 # Link the target with all objects and libraries
--- a/docs/examples/getinmemory.c
+++ b/docs/examples/getinmemory.c
@@ -0,0 +1,80 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ *
+ * Example source code to show how the callback function can be used to
+ * download data into a chunk of memory instead of storing it in a file.
+ *
+ * This exact source code has not been verified to work.
+ */
+
+/* to make this work under windows, use the win32-functions from the
+   win32socket.c file as well */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+struct MemoryStruct {
+  char *memory;
+  size_t size;
+};
+
+size_t
+WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
+{
+  register int realsize = size * nmemb;
+  struct MemoryStruct *mem = (struct MemoryStruct *)data;
+  
+  mem->memory = (char *)realloc(mem->memory, mem->size + realsize + 1);
+  if (mem->memory) {
+    memcpy(&(mem->memory[mem->size]), ptr, realsize);
+    mem->size += realsize;
+    mem->memory[mem->size] = 0;
+  }
+  return realsize;
+}
+
+int main(int argc, char **argv)
+{
+  CURL *curl_handle;
+
+  struct MemoryStruct chunk;
+
+  chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
+  chunk.size = 0;    /* no data at this point */
+
+  /* init the curl session */
+  curl_handle = curl_easy_init();
+
+  /* specify URL to get */
+  curl_easy_setopt(curl_handle, CURLOPT_URL, "http://cool.haxx.se/");
+
+  /* send all data to this function  */
+  curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
+
+  /* we pass our 'chunk' struct to the callback function */
+  curl_easy_setopt(curl_handle, CURLOPT_FILE, (void *)&chunk);
+
+  /* get it! */
+  curl_easy_perform(curl_handle);
+
+  /* cleanup curl stuff */
+  curl_easy_cleanup(curl_handle);
+
+  /*
+   * Now, our chunk.memory points to a memory block that is chunk.size
+   * bytes big and contains the remote file.
+   *
+   * Do something nice with it!
+   */
+
+  return 0;
+}
--- a/docs/examples/sepheaders.c
+++ b/docs/examples/sepheaders.c
@@ -19,9 +19,9 @@
 #include <curl/types.h>
 #include <curl/easy.h>

-size_t  write_data(void *ptr, size_t size, size_t nmemb, FILE *stream)
+size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
 {
-  written = fwrite(ptr,size,nmemb,outfile);
+  written = fwrite(ptr, size, nmemb, (FILE *)stream);
  return written;
 }

--- a/docs/libcurl.5
+++ b/docs/libcurl.5
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" Written by Daniel Stenberg
 .\"
-.TH libcurl 5 "23 April 2001" "libcurl 7.7.2" "libcurl overview"
+.TH libcurl 5 "28 May 2001" "libcurl 7.8" "libcurl overview"
 .SH NAME
 libcurl \- client-side URL transfers
 .SH DESCRIPTION
@@ -12,30 +12,30 @@ specific man pages for each function mentioned in here.
 libcurl can also be used directly from within your Java, PHP, Perl, Ruby or
 Tcl programs as well, look elsewhere for documentation on this!

-When using libcurl's easy interface, you init your session and get a handle,
-which you use as input to the following interface functions you use. Use
-.B curl_easy_init()
+All applications that use libcurl should call \fIcurl_global_init()\fP exactly
+once before any libcurl function can be used. After all usage of libcurl is
+complete, it \fBmust\fP call \fIcurl_global_cleanup()\fP. In between those two
+calls, you can use libcurl as described below.
+
+When using libcurl you init your session and get a handle, which you use as
+input to the following interface functions you use. Use \fIcurl_easy_init()\fP
 to get the handle.

 You continue by setting all the options you want in the upcoming transfer,
 most important among them is the URL itself (you can't transfer anything
 without a specified URL as you may have figured out yourself). You might want
 to set some callbacks as well that will be called from the library when data
-is available etc.
-.B curl_easy_setopt()
-is there for this.
+is available etc.  \fIcurl_easy_setopt()\fP is there for this.

 When all is setup, you tell libcurl to perform the transfer using
-.B curl_easy_perform().
-It will then do the entire operation and won't return until it is done
-(successfully or not).
+\fIcurl_easy_perform()\fP.  It will then do the entire operation and won't
+return until it is done (successfully or not).

 After the transfer has been made, you can set new options and make another
 transfer, or if you're done, cleanup the session by calling
-.B curl_easy_cleanup().
-If you want persistant connections, you don't cleanup immediately, but instead
-run ahead and perform other transfers using the same handle. See the chapter
-below for Persistant Connections.
+\fIcurl_easy_cleanup()\fP.  If you want persistant connections, you don't
+cleanup immediately, but instead run ahead and perform other transfers using
+the same handle. See the chapter below for Persistant Connections.

 There is also a series of other helpful functions to use. They are:

@@ -68,7 +68,7 @@ frees a whole curl_slist
 .B curl_mprintf()
 portable printf() functions
 .TP
-.B curl_streual()
+.B curl_strequal()
 portable case insensitive string comparisons
 .RE

--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -146,11 +146,17 @@ typedef enum {
  CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */
  CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */
  CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */
-  CURLE_ALREADY_COMPLETE,	 /* 50 - file to dowload is already complete */
+  CURLE_OBSOLETE,	         /* 50 - removed after 7.7.3 */
+  CURLE_SSL_PEER_CERTIFICATE,    /* 51 - peer's certificate wasn't ok */
  
  CURL_LAST /* never use! */
 } CURLcode;

+/* this was the error code 50 in 7.7.3 and a few earlier versions, this
+   is no longer used by libcurl but is instead #defined here only to not
+   make programs break */
+#define CURLE_ALREADY_COMPLETE 99999
+
 /* This is just to make older programs not break: */
 #define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE

@@ -486,9 +492,19 @@ char *curl_version(void);
 char *curl_escape(char *string, int length);
 char *curl_unescape(char *string, int length);

+/* curl_global_init() should be invoked exactly once for each application that
+   uses libcurl */
+CURLcode curl_global_init(long flags);
+
+/* curl_global_cleanup() should be invoked exactly once for each application
+   that uses libcurl */
+void curl_global_cleanup(void);
+
+
+
 /* This is the version number */
-#define LIBCURL_VERSION "7.7.3"
-#define LIBCURL_VERSION_NUM 0x070703
+#define LIBCURL_VERSION "7.8-pre2"
+#define LIBCURL_VERSION_NUM 0x070800

 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
@@ -557,6 +573,9 @@ typedef enum {
  CURLCLOSEPOLICY_LAST /* last, never use this */
 } curl_closepolicy;

+#define CURL_GLOBAL_NOT_SSL (1<<0)
+#define CURL_GLOBAL_NOTHING CURL_GLOBAL_NOT_SSL
+#define CURL_GLOBAL_DEFAULT 0

 #ifdef  __cplusplus
 }
--- a/java/README
+++ b/java/README
@@ -6,7 +6,9 @@

                                Java Interface

- This is very much work in progress and it does not work.
+ This is not a complete implementation of a libcurl interface. I've made the
+core work and it needs additional code to be added to get the rest of the
+stuff supported.

 The interface is not set yet, bring your suggestions!

--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,7 @@ lib_LTLIBRARIES = libcurl.la
 INCLUDES = -I$(top_srcdir)/include


-libcurl_la_LDFLAGS = -version-info 2:0:0
+libcurl_la_LDFLAGS = -version-info 2:0:1
 # 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.
@@ -59,7 +59,7 @@ escape.c       mprintf.c      telnet.c       \
 escape.h       getpass.c      netrc.c        telnet.h       \
 getinfo.c transfer.c strequal.c strequal.h easy.c \
 security.h security.c krb4.c krb4.h memdebug.c memdebug.h inet_ntoa_r.h \
-http_chunks.c http_chunks.h
+http_chunks.c http_chunks.h strtok.c strtok.h

 noinst_HEADERS = setup.h transfer.h

--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -86,6 +86,7 @@ Example set of cookies:
 #include "cookie.h"
 #include "getdate.h"
 #include "strequal.h"
+#include "strtok.h"

 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
@@ -199,6 +200,7 @@ Curl_cookie_add(struct CookieInfo *c,
    /* This line is NOT a HTTP header style line, we do offer support for
       reading the odd netscape cookies-file format here */
    char *firstptr;
+    char *tok_buf;
    int fields;

    if(lineptr[0]=='#') {
@@ -214,7 +216,7 @@ Curl_cookie_add(struct CookieInfo *c,
    if(ptr)
      *ptr=0; /* clear it */

-    firstptr=strtok(lineptr, "\t"); /* first tokenize it on the TAB */
+    firstptr=strtok_r(lineptr, "\t", &tok_buf); /* first tokenize it on the TAB */

    /* Here's a quick check to eliminate normal HTTP-headers from this */
    if(!firstptr || strchr(firstptr, ':')) {
@@ -224,17 +226,38 @@ Curl_cookie_add(struct CookieInfo *c,

    /* Now loop through the fields and init the struct we already have
       allocated */
-    for(ptr=firstptr, fields=0; ptr; ptr=strtok(NULL, "\t"), fields++) {
+    for(ptr=firstptr, fields=0; ptr; ptr=strtok_r(NULL, "\t", &tok_buf), fields++) {
      switch(fields) {
      case 0:
        co->domain = strdup(ptr);
        break;
      case 1:
-        /* what _is_ this field for? */
+        /* This field got its explanation on the 23rd of May 2001 by
+           Andr<64>s Garc<72>a:
+
+           flag: A TRUE/FALSE value indicating if all machines within a given
+           domain can access the variable. This value is set automatically by
+           the browser, depending on the value you set for the domain.
+
+           As far as I can see, it is set to true when the cookie says
+           .domain.com and to false when the domain is complete www.domain.com
+
+           We don't currently take advantage of this knowledge.
+        */
        break;
      case 2:
+        /* It turns out, that sometimes the file format allows the path
+           field to remain not filled in, we try to detect this and work
+           around it! Andr<64>s Garc<72>a made us aware of this... */
+        if (strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) {
+          /* only if the path doesn't look like a boolean option! */
          co->path = strdup(ptr);
          break;
+        }
+        /* this doesn't look like a path, make one up! */
+        co->path = strdup("/");
+        fields++; /* add a field and fall down to secure */
+        /* FALLTHROUGH */
      case 3:
        co->secure = strequal(ptr, "TRUE");
        break;
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -73,16 +73,32 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "transfer.h"
-#include <curl/types.h>
+#include "ssluse.h"

 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>

+CURLcode curl_global_init(long flags)
+{
+  if(!(flags & CURL_GLOBAL_NOT_SSL))
+    Curl_SSL_init();
+
+  return CURLE_OK;
+}
+
+void curl_global_cleanup(void)
+{
+  Curl_SSL_cleanup();
+}
+
 CURL *curl_easy_init(void)
 {
  CURLcode res;
  struct UrlData *data;

+  /* Make sure we inited the global SSL stuff */
+  Curl_SSL_init();
+
  /* We use curl_open() with undefined URL so far */
  res = Curl_open((CURL **)&data, NULL);
  if(res != CURLE_OK)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -481,8 +481,9 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
  if(conn->protocol & PROT_FTPS) {
    /* FTPS is simply ftp with SSL for the control channel */
    /* now, perform the SSL initialization for this socket */
-    if(Curl_SSLConnect(conn))
-      return CURLE_SSL_CONNECT_ERROR;
+    result = Curl_SSLConnect(conn);
+    if(result)
+      return result;
  }


@@ -655,11 +656,14 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
      failf(data, "Received only partial file");
      return CURLE_PARTIAL_FILE;
    }
-    else if(!data->bits.no_body && (0 == *ftp->bytecountp)) {
+    else if(!conn->bits.resume_done &&
+            !data->bits.no_body &&
+            (0 == *ftp->bytecountp)) {
      failf(data, "No data was received!");
      return CURLE_FTP_COULDNT_RETR_FILE;
    }
  }
+
 #ifdef KRB4
  sec_fflush_fd(conn, conn->secondarysocket);
 #endif
@@ -667,7 +671,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
  sclose(conn->secondarysocket);
  conn->secondarysocket = -1;

-  if(!data->bits.no_body) {  
+  if(!data->bits.no_body && !conn->bits.resume_done) {  
    /* now let's see what the server says about the transfer we
       just performed: */
    nread = Curl_GetFTPResponse(conn->firstsocket, buf, conn, &ftpcode);
@@ -681,6 +685,8 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
    }
  }

+  conn->bits.resume_done = FALSE; /* clean this for next connection */
+
  /* Send any post-transfer QUOTE strings? */
  if(data->postquote) {
    qitem = data->postquote;
@@ -848,10 +854,8 @@ CURLcode _ftp(struct connectdata *conn)
    if(nread < 0)
      return CURLE_OPERATION_TIMEOUTED;

-    if(ftpcode != 213) {
-      failf(data, "Couldn't get file size: %s", buf+4);
-      return CURLE_FTP_COULDNT_GET_SIZE;
-    }
+    if(ftpcode == 213) {
+
      /* get the size from the ascii string: */
      filesize = atoi(buf+4);

@@ -877,6 +881,7 @@ CURLcode _ftp(struct connectdata *conn)
          return result;
      }
 #endif
+    }

    return CURLE_OK;
  }
@@ -895,8 +900,8 @@ CURLcode _ftp(struct connectdata *conn)
 #else
    const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
 #endif
-    char *ap;
-    char *pp;
+    unsigned char *ap;
+    unsigned char *pp;
    int alen, plen;
    char portmsgbuf[4096], tmp[4096];

@@ -963,17 +968,17 @@ CURLcode _ftp(struct connectdata *conn)

      switch (sa->sa_family) {
      case AF_INET:
-	ap = (char *)&((struct sockaddr_in *)&ss)->sin_addr;
+	ap = (unsigned char *)&((struct sockaddr_in *)&ss)->sin_addr;
 	alen = sizeof(((struct sockaddr_in *)&ss)->sin_addr);
-	pp = (char *)&((struct sockaddr_in *)&ss)->sin_port;
+	pp = (unsigned char *)&((struct sockaddr_in *)&ss)->sin_port;
 	plen = sizeof(((struct sockaddr_in *)&ss)->sin_port);
 	lprtaf = 4;
 	eprtaf = 1;
 	break;
      case AF_INET6:
-	ap = (char *)&((struct sockaddr_in6 *)&ss)->sin6_addr;
+	ap = (unsigned char *)&((struct sockaddr_in6 *)&ss)->sin6_addr;
 	alen = sizeof(((struct sockaddr_in6 *)&ss)->sin6_addr);
-	pp = (char *)&((struct sockaddr_in6 *)&ss)->sin6_port;
+	pp = (unsigned char *)&((struct sockaddr_in6 *)&ss)->sin6_port;
 	plen = sizeof(((struct sockaddr_in6 *)&ss)->sin6_port);
 	lprtaf = 6;
 	eprtaf = 2;
@@ -1167,6 +1172,7 @@ again:;
  }
  else { /* we use the PASV command */
 #if 0
+    /* no support for IPv6 passive mode yet */
    char *mode[] = { "EPSV", "LPSV", "PASV", NULL };
    int results[] = { 229, 228, 227, 0 };
 #else
@@ -1500,8 +1506,17 @@ again:;
          data->infilesize -= conn->resume_from;

          if(data->infilesize <= 0) {
-            failf(data, "File already completely uploaded\n");
-            return CURLE_FTP_COULDNT_STOR_FILE;
+            infof(data, "File already completely uploaded\n");
+
+            /* no data to transfer */
+            result=Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
+            
+            /* Set resume done so that we won't get any error in
+             * Curl_ftp_done() because we didn't transfer the amount of bytes
+             * that the local file file obviously is */
+            conn->bits.resume_done = TRUE; 
+
+            return CURLE_OK;
          }
        }
        /* we've passed, proceed as normal */
@@ -1678,8 +1693,16 @@ again:;
        }

 	if (downloadsize == 0) {
-	  failf(data, "File already complete");
-	  return CURLE_ALREADY_COMPLETE;
+          /* no data to transfer */
+          result=Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
+	  infof(data, "File already completely downloaded\n");
+
+          /* Set resume done so that we won't get any error in Curl_ftp_done()
+           * because we didn't transfer the amount of bytes that the remote
+           * file obviously is */
+          conn->bits.resume_done = TRUE; 
+
+	  return CURLE_OK;
 	}
 	
        /* Set resume file transfer offset */
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -123,7 +123,6 @@ struct hostent *Curl_gethost(struct UrlData *data,
  int ret; /* this variable is unused on several platforms but used on some */

 #define CURL_NAMELOOKUP_SIZE 9000
-
  /* Allocate enough memory to hold the full name information structs and
   * everything. OSF1 is known to require at least 8872 bytes. The buffer
   * required for storing all possible aliases and IP numbers is according to
@@ -133,6 +132,8 @@ struct hostent *Curl_gethost(struct UrlData *data,
    return NULL; /* major failure */
  *bufp = buf;

+  ret = 0; /* to prevent the compiler warning */
+
  if ( (in=inet_addr(hostname)) != INADDR_NONE ) {
    struct in_addr *addrentry;

--- a/lib/http.c
+++ b/lib/http.c
@@ -336,8 +336,9 @@ CURLcode Curl_http_connect(struct connectdata *conn)
    }

    /* now, perform the SSL initialization for this socket */
-    if(Curl_SSLConnect(conn))
-      return CURLE_SSL_CONNECT_ERROR;
+    result = Curl_SSLConnect(conn);
+    if(result)
+      return result;
  }

  if(conn->bits.user_passwd && !data->bits.this_is_a_follow) {
@@ -718,8 +719,7 @@ CURLcode Curl_http(struct connectdata *conn)
      http->storefread = data->fread; /* backup */
      http->in = data->in; /* backup */
          
-      data->fread =
-        (size_t (*)(char *, size_t, size_t, FILE *))
+      data->fread = (curl_read_callback)
        Curl_FormReader; /* set the read function to read from the
                            generated form data */
      data->in = (FILE *)&http->form;
--- a/lib/krb4.c
+++ b/lib/krb4.c
@@ -81,8 +81,8 @@ struct krb4_data {
 };

 #ifndef HAVE_STRLCPY
-
-size_t
+/* if it ever goes non-static, make it Curl_ prefixed! */
+size_t static 
 strlcpy (char *dst, const char *src, size_t dst_sz)
 {
    size_t n;
--- a/lib/netrc.c
+++ b/lib/netrc.c
@@ -41,6 +41,7 @@
 #include <curl/curl.h>

 #include "strequal.h"
+#include "strtok.h"

 /* The last #include file should be: */
 #ifdef MALLOCDEBUG
@@ -111,8 +112,9 @@ int Curl_parsenetrc(char *host,
  file = fopen(netrcbuffer, "r");
  if(file) {
    char *tok;
+	char *tok_buf;
    while(fgets(netrcbuffer, sizeof(netrcbuffer), file)) {
-      tok=strtok(netrcbuffer, " \t\n");
+      tok=strtok_r(netrcbuffer, " \t\n", &tok_buf);
      while(tok) {
 	switch(state) {
 	case NOTHING:
@@ -163,7 +165,7 @@ int Curl_parsenetrc(char *host,
 	  }
 	  break;
 	} /* switch (state) */
-	tok = strtok(NULL, " \t\n");
+	tok = strtok_r(NULL, " \t\n", &tok_buf);
      } /* while (tok) */
    } /* while fgets() */

--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -235,10 +235,54 @@ int cert_verify_callback(int ok, X509_STORE_CTX *ctx)

 #endif

+#ifdef USE_SSLEAY
+/* "global" init done? */
+static int init_ssl=0;
+#endif
+
+/* Global init */
+void Curl_SSL_init(void)
+{
+#ifdef USE_SSLEAY
+
+  /* make sure this is only done once */
+  if(0 != init_ssl)
+    return;
+
+  init_ssl++; /* never again */
+
+  /* Lets get nice error messages */
+  SSL_load_error_strings();
+
+  /* Setup all the global SSL stuff */
+  SSLeay_add_ssl_algorithms();
+#endif
+}
+
+/* Global cleanup */
+void Curl_SSL_cleanup(void)
+{
+#ifdef USE_SSLEAY
+  if(init_ssl) {
+    /* only cleanup if we did a previous init */
+
+    /* Free the SSL error strings */
+    ERR_free_strings();
+  
+    /* EVP_cleanup() removes all ciphers and digests from the
+       table. */
+    EVP_cleanup();
+  }
+#endif  
+}
+
+
 /* ====================================================== */
-int
+CURLcode
 Curl_SSLConnect(struct connectdata *conn)
 {
+  CURLcode retcode = CURLE_OK;
+
 #ifdef USE_SSLEAY
  struct UrlData *data = conn->data;
  int err;
@@ -248,15 +292,9 @@ Curl_SSLConnect(struct connectdata *conn)
  /* mark this is being ssl enabled from here on out. */
  conn->ssl.use = TRUE;

-  /* Lets get nice error messages */
-  SSL_load_error_strings();
-
  /* Make funny stuff to get random input */
  random_the_seed(conn);
    
-  /* Setup all the global SSL stuff */
-  SSLeay_add_ssl_algorithms();
-
  switch(data->ssl.version) {
  default:
    req_method = SSLv23_client_method();
@@ -273,13 +311,13 @@ Curl_SSLConnect(struct connectdata *conn)

  if(!conn->ssl.ctx) {
    failf(data, "SSL: couldn't create a context!");
-    return 1;
+    return CURLE_OUT_OF_MEMORY;
  }
    
  if(data->cert) {
    if (!cert_stuff(conn, data->cert, data->cert)) {
      failf(data, "couldn't use certificate!\n");
-      return 2;
+      return CURLE_SSL_CONNECT_ERROR;
    }
  }

@@ -292,7 +330,7 @@ Curl_SSLConnect(struct connectdata *conn)
                                       data->ssl.CAfile,
                                       data->ssl.CApath)) {
      failf(data,"error setting cerficate verify locations\n");
-      return 2;
+      return CURLE_SSL_CONNECT_ERROR;
    }
  }
  else
@@ -312,7 +350,7 @@ Curl_SSLConnect(struct connectdata *conn)
  if (-1 == err) {
    err = ERR_get_error(); 
    failf(data, "SSL: %s", ERR_error_string(err, NULL));
-    return 10;
+    return CURLE_SSL_CONNECT_ERROR;
  }

  /* Informational message */
@@ -328,7 +366,7 @@ Curl_SSLConnect(struct connectdata *conn)
  conn->ssl.server_cert = SSL_get_peer_certificate (conn->ssl.handle);
  if(!conn->ssl.server_cert) {
    failf(data, "SSL: couldn't get peer certificate!");
-    return 3;
+    return CURLE_SSL_PEER_CERTIFICATE;
  }
  infof (data, "Server certificate:\n");
  
@@ -336,7 +374,7 @@ Curl_SSLConnect(struct connectdata *conn)
                           NULL, 0);
  if(!str) {
    failf(data, "SSL: couldn't get X509-subject!");
-    return 4;
+    return CURLE_SSL_CONNECT_ERROR;
  }
  infof(data, "\t subject: %s\n", str);
  CRYPTO_free(str);
@@ -345,7 +383,7 @@ Curl_SSLConnect(struct connectdata *conn)
                           NULL, 0);
  if(!str) {
    failf(data, "SSL: couldn't get X509-issuer name!");
-    return 5;
+    return CURLE_SSL_CONNECT_ERROR;
  }
  infof(data, "\t issuer: %s\n", str);
  CRYPTO_free(str);
@@ -355,7 +393,9 @@ Curl_SSLConnect(struct connectdata *conn)

  if(data->ssl.verifypeer) {
    data->ssl.certverifyresult=SSL_get_verify_result(conn->ssl.handle);
-    infof(data, "Verify result: %d\n", data->ssl.certverifyresult);
+    failf(data, "SSL certificate verify result: %d\n",
+          data->ssl.certverifyresult);
+    retcode = CURLE_SSL_PEER_CERTIFICATE;
  }
  else
    data->ssl.certverifyresult=0;
@@ -365,5 +405,5 @@ Curl_SSLConnect(struct connectdata *conn)
  /* this is for "-ansi -Wall -pedantic" to stop complaining!   (rabe) */
  (void) conn;
 #endif
-  return 0;
+  return retcode;
 }
--- a/lib/ssluse.h
+++ b/lib/ssluse.h
@@ -23,5 +23,9 @@
 * $Id$
 *****************************************************************************/
 #include "urldata.h"
-int Curl_SSLConnect(struct connectdata *conn);
+CURLcode Curl_SSLConnect(struct connectdata *conn);
+/* Global SSL init */
+void Curl_SSL_init(void);
+/* Global SSL cleanup */
+void Curl_SSL_cleanup(void);
 #endif
--- a/lib/strequal.c
+++ b/lib/strequal.c
@@ -80,7 +80,7 @@ int curl_strnequal(const char *first, const char *second, size_t max)
 *
 * 
 */
-size_t strlcat(char *dst, const char *src, size_t siz)
+size_t Curl_strlcat(char *dst, const char *src, size_t siz)
 {
  char *d = dst;
  const char *s = src;
--- a/lib/strequal.h
+++ b/lib/strequal.h
@@ -33,7 +33,8 @@ int curl_strnequal(const char *first, const char *second, size_t max);
 #define strnequal(a,b,c) curl_strnequal(a,b,c)

 #ifndef HAVE_STRLCAT
-size_t strlcat(char *dst, const char *src, size_t siz);
+#define strlcat(x,y,z) Curl_strlcat(x,y,z)
+size_t Curl_strlcat(char *dst, const char *src, size_t siz);
 #endif

 #endif
--- a/lib/strtok.c
+++ b/lib/strtok.c
@@ -0,0 +1,128 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * In order to be useful for every potential user, curl and libcurl are
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the MPL or the MIT/X-derivate
+ * licenses. You may pick one of these licenses.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ *****************************************************************************/
+
+
+#include "setup.h"
+
+#ifndef HAVE_STRTOK_R
+
+/*
+ * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
+ *
+ * strtok_r, from Berkeley strtok
+ * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
+ *
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notices, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notices, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *
+ *	This product includes software developed by Softweyr LLC, the
+ *      University of California, Berkeley, and its contributors.
+ *
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SOFTWEYR LLC, THE REGENTS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SOFTWEYR LLC, THE
+ * REGENTS, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stddef.h>
+
+char *
+Curl_strtok_r(char *s, const char *delim, char **last)
+{
+  char *spanp;
+  int c, sc;
+  char *tok;
+
+  if (s == NULL && (s = *last) == NULL) {
+    return NULL;
+  }
+
+  /*
+   * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
+   */
+ cont:
+  c = *s++;
+  for (spanp = (char *)delim; (sc = *spanp++) != 0; ) {
+    if (c == sc) {
+      goto cont;
+    }
+  }
+
+  if (c == 0) {		/* no non-delimiter characters */
+    *last = NULL;
+    return NULL;
+  }
+  tok = s - 1;
+  
+  /*
+   * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
+   * Note that delim must have one NUL; we stop if we see that, too.
+   */
+  for (;;) {
+    c = *s++;
+    spanp = (char *)delim;
+    do {
+      if ((sc = *spanp++) == c) {
+        if (c == 0) {
+          s = NULL;
+        }
+        else {
+          char *w = s - 1;
+          *w = '\0';
+        }
+        *last = s;
+        return tok;
+      }
+    }
+    while (sc != 0);
+  }
+  /* NOTREACHED */
+}
+
+#endif
+
--- a/lib/strtok.h
+++ b/lib/strtok.h
@@ -0,0 +1,38 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2000, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * In order to be useful for every potential user, curl and libcurl are
+ * dual-licensed under the MPL and the MIT/X-derivate licenses.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the MPL or the MIT/X-derivate
+ * licenses. You may pick one of these licenses.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ *****************************************************************************/
+
+#ifndef _CURL_STRTOK_R_H
+#define _CURL_STRTOK_R_H
+
+#include <stddef.h>
+#include "setup.h"
+
+#ifndef HAVE_STRTOK_R
+char *Curl_strtok_r(char *s, const char *delim, char **last);
+#define strtok_r Curl_strtok_r
+#else
+extern char *strtok_r(char *s1, const char *s2, char **lasts);
+#endif
+
+#endif
+
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -103,8 +103,74 @@
 #define min(a, b)   ((a) < (b) ? (a) : (b))
 #endif

-/* Parts of this function was written by the friendly Mark Butler
-   <butlerm@xmission.com>. */
+/*
+ * compareheader()
+ *
+ * Returns TRUE if 'headerline' contains the 'header' with given 'content'.
+ * Pass headers WITH the colon.
+ */
+static bool
+compareheader(char *headerline, /* line to check */
+              char *header,     /* header keyword _with_ colon */
+              char *content)    /* content string to find */
+{
+  /* RFC2616, section 4.2 says: "Each header field consists of a name followed
+   * by a colon (":") and the field value. Field names are case-insensitive.
+   * The field value MAY be preceded by any amount of LWS, though a single SP
+   * is preferred." */
+
+  size_t hlen = strlen(header);
+  size_t clen;
+  size_t len;
+  char *start;
+  char *end;
+
+  if(!strnequal(headerline, header, hlen))
+    return FALSE; /* doesn't start with header */
+
+  /* pass the header */
+  start = &headerline[hlen];
+
+  /* pass all white spaces */
+  while(*start && isspace((int)*start))
+    start++;
+
+  /* find the end of the header line */
+  end = strchr(start, '\r'); /* lines end with CRLF */
+  if(!end) {
+    /* in case there's a non-standard compliant line here */
+    end = strchr(start, '\n');
+
+    if(!end)
+      /* hm, there's no line ending here, return false and bail out! */
+      return FALSE;
+  }
+
+  len = end-start; /* length of the content part of the input line */
+  clen = strlen(content); /* length of the word to find */
+
+  /* find the content string in the rest of the line */
+  for(;len>=clen;len--, start++) {
+    if(strnequal(start, content, clen))
+      return TRUE; /* match! */
+  }
+
+  return FALSE; /* no match */
+}
+
+/*
+ * Transfer()
+ *
+ * This function is what performs the actual transfer. It is capable of
+ * doing both ways simultaneously.
+ * The transfer must already have been setup by a call to Curl_Transfer().
+ *
+ * Note that headers are created in a preallocated buffer of a default size.
+ * That buffer can be enlarged on demand, but it is never shrinken again.
+ *
+ * Parts of this function was once written by the friendly Mark Butler
+ * <butlerm@xmission.com>.
+ */

 CURLcode static
 Transfer(struct connectdata *c_conn)
@@ -262,6 +328,10 @@ Transfer(struct connectdata *c_conn)
                /* copy what is remaining into headerbuff */
                int str_length = (int)strlen(str);

+                /*
+                 * We enlarge the header buffer if it seems to be too
+                 * smallish
+                 */
                if (hbuflen + (int)str_length >= data->headersize) {
                  char *newbuff;
                  long newsize=MAX((hbuflen+str_length)*3/2,
@@ -284,6 +354,12 @@ Transfer(struct connectdata *c_conn)

              str = end_ptr + 1;	/* move just past new line */

+              /*
+               * We're about to copy a chunk of data to the end of the
+               * already received header. We make sure that the full string
+               * fit in the allocated header buffer, or else we enlarge 
+               * it.
+               */
              if (hbuflen + (str - str_start) >= data->headersize) {
                char *newbuff;
                long newsize=MAX((hbuflen+(str-str_start))*3/2,
@@ -307,23 +383,17 @@ Transfer(struct connectdata *c_conn)
              
              p = data->headerbuff;
              
-              /* we now have a full line that p points to */
-              if (('\n' == *p) || ('\r' == *p)) {
-                /* Zero-length line means end of header! */
-#if 0
-                if (-1 != conn->size)	/* if known */
-                  conn->size += bytecount; /* we append the already read
-                                              size */
-#endif
+              /****
+               * We now have a FULL header line that p points to
+               *****/

+              if (('\n' == *p) || ('\r' == *p)) {
+                /* Zero-length header line means end of headers! */

                if ('\r' == *p)
                  p++;		/* pass the \r byte */
                if ('\n' == *p)
                  p++;		/* pass the \n byte */
-#if 0 /* headers are not included in the size */
-                Curl_pgrsSetDownloadSize(data, conn->size);
-#endif

                if(100 == httpcode) {
                  /*
@@ -354,7 +424,7 @@ Transfer(struct connectdata *c_conn)

                if(!header) {
                  /*
-                   * end-of-headers.
+                   * really end-of-headers.
                   *
                   * If we requested a "no body", this is a good time to get
                   * out and return home.
@@ -387,11 +457,18 @@ Transfer(struct connectdata *c_conn)
                continue;
              }

+              /*
+               * Checks for special headers coming up.
+               */
+              
              if (!headerline++) {
                /* This is the first header, it MUST be the error code line
                   or else we consiser this to be the body right away! */
                if (2 == sscanf (p, " HTTP/1.%d %3d", &httpversion,
                                 &httpcode)) {
+                  data->progress.httpcode = httpcode;
+                  data->progress.httpversion = httpversion;
+
                  /* 404 -> URL not found! */
                  if (
                      ( ((data->bits.http_follow_location) &&
@@ -406,8 +483,6 @@ Transfer(struct connectdata *c_conn)
                    failf (data, "The requested file was not found");
                    return CURLE_HTTP_NOT_FOUND;
                  }
-                  data->progress.httpcode = httpcode;
-                  data->progress.httpversion = httpversion;

                  if(httpversion == 0)
                    /* Default action for HTTP/1.0 must be to close, unless
@@ -430,15 +505,14 @@ Transfer(struct connectdata *c_conn)
                }
              }
              /* check for Content-Length: header lines to get size */
-              if (strnequal("Content-Length", p, 14) &&
-                  sscanf (p+14, ": %ld", &contentlength)) {
+              if (strnequal("Content-Length:", p, 15) &&
+                  sscanf (p+15, " %ld", &contentlength)) {
                conn->size = contentlength;
                Curl_pgrsSetDownloadSize(data, contentlength);
              }
              else if((httpversion == 0) &&
                      conn->bits.httpproxy &&
-                      strnequal("Proxy-Connection: keep-alive", p,
-                                strlen("Proxy-Connection: keep-alive"))) {
+                      compareheader(p, "Proxy-Connection:", "keep-alive")) {
                /*
                 * When a HTTP/1.0 reply comes when using a proxy, the
                 * 'Proxy-Connection: keep-alive' line tells us the
@@ -449,8 +523,7 @@ Transfer(struct connectdata *c_conn)
                infof(data, "HTTP/1.0 proxy connection set to keep alive!\n");
              }
              else if((httpversion == 0) &&
-                      strnequal("Connection: keep-alive", p,
-                                strlen("Connection: keep-alive"))) {
+                      compareheader(p, "Connection:", "keep-alive")) {
                /*
                 * A HTTP/1.0 reply with the 'Connection: keep-alive' line
                 * tells us the connection will be kept alive for our
@@ -460,8 +533,7 @@ Transfer(struct connectdata *c_conn)
                conn->bits.close = FALSE; /* don't close when done */
                infof(data, "HTTP/1.0 connection set to keep alive!\n");
              }
-              else if (strnequal("Connection: close", p,
-                                 strlen("Connection: close"))) {
+              else if (compareheader(p, "Connection:", "close")) {
                /*
                 * [RFC 2616, section 8.1.2.1]
                 * "Connection: close" is HTTP/1.1 language and means that
@@ -470,8 +542,7 @@ Transfer(struct connectdata *c_conn)
                 */
                conn->bits.close = TRUE; /* close when done */
              }
-              else if (strnequal("Transfer-Encoding: chunked", p,
-                                 strlen("Transfer-Encoding: chunked"))) {
+              else if (compareheader(p, "Transfer-Encoding:", "chunked")) {
                /*
                 * [RFC 2616, section 3.6.1] A 'chunked' transfer encoding
                 * means that the server will send a series of "chunks". Each
@@ -485,9 +556,9 @@ Transfer(struct connectdata *c_conn)
                /* init our chunky engine */
                Curl_httpchunk_init(conn);
              }
-              else if (strnequal("Content-Range", p, 13)) {
-                if (sscanf (p+13, ": bytes %d-", &offset) ||
-                    sscanf (p+13, ": bytes: %d-", &offset)) {
+              else if (strnequal("Content-Range:", p, 14)) {
+                if (sscanf (p+14, " bytes %d-", &offset) ||
+                    sscanf (p+14, " bytes: %d-", &offset)) {
                  /* This second format was added August 1st 2000 by Igor
                     Khristophorov since Sun's webserver JavaWebServer/1.1.1
                     obviously sends the header this way! :-( */
@@ -498,7 +569,7 @@ Transfer(struct connectdata *c_conn)
                }
              }
              else if(data->cookies &&
-                      strnequal("Set-Cookie: ", p, 11)) {
+                      strnequal("Set-Cookie:", p, 11)) {
                Curl_cookie_add(data->cookies, TRUE, &p[12]);
              }
              else if(strnequal("Last-Modified:", p,
@@ -511,14 +582,20 @@ Transfer(struct connectdata *c_conn)
              }
              else if ((httpcode >= 300 && httpcode < 400) &&
                       (data->bits.http_follow_location) &&
-                       strnequal("Location: ", p, 10)) {
+                       strnequal("Location:", p, 9)) {
                /* this is the URL that the server advices us to get instead */
                char *ptr;
                char *start=p;
                char backup;

-                start += 10; /* pass "Location: " */
+                start += 9; /* pass "Location:" */
+
+                /* Skip spaces and tabs. We do this to support multiple
+                   white spaces after the "Location:" keyword. */
+                while(*start && isspace((int)*start ))
+                  start++;
                ptr = start; /* start scanning here */
+
                /* scan through the string to find the end */
                while(*ptr && !isspace((int)*ptr))
                  ptr++;
@@ -528,6 +605,10 @@ Transfer(struct connectdata *c_conn)
                *ptr = backup; /* restore ending letter */
              }

+              /*
+               * End of header-checks. Write them to the client.
+               */
+
              writetype = CLIENTWRITE_HEADER;
              if (data->bits.http_include_header)
                writetype |= CLIENTWRITE_BODY;
@@ -735,6 +816,12 @@ Transfer(struct connectdata *c_conn)
      }
    }
  }
+
+  /*
+   * The tranfer has been performed. Just make some general checks before
+   * returning.
+   */
+
  if(!(data->bits.no_body) && contentlength &&
     (bytecount != contentlength)) {
    failf(data, "transfer closed with %d bytes remaining to read",
@@ -780,7 +867,14 @@ CURLcode Curl_perform(CURL *curl)
    if(res == CURLE_OK) {
      res = Curl_do(conn);
      if(res == CURLE_OK) {
+        if(conn->protocol&PROT_FTPS)
+          /* FTPS, disable ssl while transfering data */
+          conn->ssl.use = FALSE;
        res = Transfer(conn); /* now fetch that URL please */
+        if(conn->protocol&PROT_FTPS)
+          /* FTPS, enable ssl again after havving transferred data */
+          conn->ssl.use = TRUE;
+
        if(res == CURLE_OK) {
          /*
           * We must duplicate the new URL here as the connection data
@@ -904,6 +998,7 @@ CURLcode Curl_perform(CURL *curl)
      
        /* TBD: set the URL with curl_setopt() */
        data->url = newurl;
+        newurl = NULL; /* don't free! */

        data->bits.urlstringalloc = TRUE; /* the URL is allocated */

@@ -983,7 +1078,6 @@ CURLcode Curl_perform(CURL *curl)
  return res;
 }

-
 CURLcode 
 Curl_Transfer(struct connectdata *c_conn, /* connection data */
              int sockfd,	/* socket to read from or -1 */
--- a/lib/transfer.h
+++ b/lib/transfer.h
@@ -35,11 +35,4 @@ Curl_Transfer (struct connectdata *data,
                                        the same we read from. -1 disables */
               long *writebytecountp /* return number of bytes written */
 );
-
-#ifdef _OLDCURL
-/* "hackish" define to make sources compile without too much human editing.
-   Don't use "Tranfer()" anymore! */
-#define Transfer(a,b,c,d,e,f,g) Curl_Transfer(a,b,c,d,e,f,g)
-#endif
-
 #endif
--- a/lib/url.c
+++ b/lib/url.c
@@ -91,6 +91,7 @@
 #include "cookie.h"
 #include "strequal.h"
 #include "escape.h"
+#include "strtok.h"

 /* And now for the protocols */
 #include "ftp.h"
@@ -833,6 +834,17 @@ CURLcode Curl_disconnect(struct connectdata *conn)

 #ifdef USE_SSLEAY
  if (conn->ssl.use) {
+    /*
+      ERR_remove_state() frees the error queue associated with
+      thread pid.  If pid == 0, the current thread will have its
+      error queue removed.
+
+      Since error queue data structures are allocated
+      automatically for new threads, they must be freed when
+      threads are terminated in oder to avoid memory leaks.
+    */
+    ERR_remove_state(0);
+
    if(conn->ssl.handle) {
      (void)SSL_shutdown(conn->ssl.handle);
      SSL_set_connect_state(conn->ssl.handle);
@@ -1549,6 +1561,7 @@ static CURLcode Connect(struct UrlData *data,
     * checked if the lowercase versions don't exist.
     */
    char *no_proxy=NULL;
+    char *no_proxy_tok_buf;
    char *proxy=NULL;
    char proxy_env[128];

@@ -1560,7 +1573,7 @@ static CURLcode Connect(struct UrlData *data,
      /* NO_PROXY wasn't specified or it wasn't just an asterisk */
      char *nope;

-      nope=no_proxy?strtok(no_proxy, ", "):NULL;
+      nope=no_proxy?strtok_r(no_proxy, ", ", &no_proxy_tok_buf):NULL;
      while(nope) {
        if(strlen(nope) <= strlen(conn->name)) {
          char *checkn=
@@ -1570,7 +1583,7 @@ static CURLcode Connect(struct UrlData *data,
            break;
          }
        }
-	nope=strtok(NULL, ", ");
+	nope=strtok_r(NULL, ", ", &no_proxy_tok_buf);
      }
      if(!nope) {
 	/* It was not listed as without proxy */
@@ -2019,25 +2032,45 @@ static CURLcode Connect(struct UrlData *data,
     */
    struct connectdata *old_conn = conn;
    char *path = old_conn->path; /* setup the current path pointer properly */
+    char *ppath = old_conn->ppath; /* this is the modified path pointer */
    if(old_conn->proxyhost)
      free(old_conn->proxyhost);
    conn = conn_temp;        /* use this connection from now on */
-    free(conn->path);        /* free the previous path pointer */

    /* we need these pointers if we speak over a proxy */
    conn->name = conn->gname;
    conn->hostname = old_conn->gname;

-    conn->path = path;       /* use this one */
-    conn->ppath = path;      /* set this too */
+    free(conn->path);    /* free the previously allocated path pointer */
+
+    /* 'path' points to the allocated data, 'ppath' may have been advanced
+       to point somewhere within the 'path' area. */
+    conn->path = path; 
+    conn->ppath = ppath;

    /* re-use init */
    conn->bits.reuse = TRUE; /* yes, we're re-using here */
-    conn->bits.chunk = FALSE; /* always assume not chunked unless told otherwise */
+    conn->bits.chunk = FALSE; /* always assume not chunked unless told
+                                 otherwise */
    conn->maxdownload = -1;  /* might have been used previously! */

    free(old_conn);          /* we don't need this anymore */

+    /*
+     * If we're doing a resumed transfer, we need to setup our stuff
+     * properly.
+     */
+    conn->resume_from = data->set_resume_from;
+    if (conn->resume_from) {
+        snprintf(resumerange, sizeof(resumerange), "%d-", conn->resume_from);
+        if (conn->bits.rangestringalloc == TRUE) 
+            free(conn->range);
+        
+        /* tell ourselves to fetch this range */
+        conn->range = strdup(resumerange);
+        conn->bits.rangestringalloc = TRUE; /* mark range string allocated */
+    }
+    
    *in_connect = conn;      /* return this instead! */

    infof(data, "Re-using existing connection! (#%d)\n", conn->connectindex);
@@ -2227,6 +2260,12 @@ CURLcode Curl_done(struct connectdata *conn)
    conn->bits.rangestringalloc = FALSE;
  }

+  /* Cleanup possible redirect junk */
+  if(conn->newurl) {
+    free(conn->newurl);
+    conn->newurl = NULL;
+  }
+ 
  /* this calls the protocol-specific function pointer previously set */
  if(conn->curl_done)
    result = conn->curl_done(conn);
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -148,7 +148,7 @@ struct HTTP {

  /* For FORM posting */
  struct Form form;
-  size_t (*storefread)(char *, size_t , size_t , FILE *);
+  curl_read_callback storefread;
  FILE *in;

  struct Curl_chunker chunk;
@@ -188,6 +188,9 @@ struct ConnectBits {

  bool use_range;
  bool rangestringalloc; /* the range string is malloc()'ed */
+
+  bool resume_done; /* nothing was transfered, resumed transfer already
+                       complete */
 };

 /*
--- a/ltmain.sh
+++ b/ltmain.sh
--- a/2
+++ b/2
@@ -73,7 +73,7 @@ if { findprog automake >/dev/null 2>/dev/null; } then
  echo "- Could not find or run automake, I hope you know what you're doing!"
 else
  echo "Runs automake --include-deps"
-  automake --include-deps
+  automake --include-deps Makefile
 fi

 ############################################################################
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = Win32 Linux
+SUBDIRS = Win32 Linux Solaris

 EXTRA_DIST = README
--- a/packages/Solaris/Makefile.am
+++ b/packages/Solaris/Makefile.am
@@ -0,0 +1,39 @@
+#
+# $Id$
+#
+
+PKGADD_PKG="@PKGADD_PKG@"
+PKGADD_NAME="@PACKAGE@-@VERSION@ - @PKGADD_NAME@"
+PKGADD_VENDOR="@PKGADD_VENDOR@"
+PKGADD_ARCH="@host_cpu@"
+PKGADD_DESC="@PACKAGE@-@VERSION@ - @PKGADD_NAME@"
+PKGADD_CLASSES=none
+PKGADD_BASEDIR=/
+
+PKGADD_FILE=${PKGADD_PKG}-@PACKAGE@-@VERSION@-@host@.pkg
+
+package:
+	if [ ! -f release ]; then echo 0 > release; fi
+	if [ `find root -newer release -print|wc -l` -gt 0 ]; then expr `cat release` + 1 > release; fi
+	echo PKG=${PKGADD_PKG} > pkginfo
+	echo NAME=${PKGADD_NAME} >> pkginfo
+	echo VENDOR=${PKGADD_VENDOR} >> pkginfo
+	echo ARCH=${PKGADD_ARCH} >> pkginfo
+	echo DESC=${PKGADD_DESC} >> pkginfo
+	echo CLASSES=${PKGADD_CLASSES} >> pkginfo
+	echo BASEDIR=${PKGADD_BASEDIR} >> pkginfo
+	echo CATEGORY=application >> pkginfo
+	echo VERSION=`cat ./release` >> pkginfo
+	echo > prototype
+	for subdir in opt var etc usr; \
+	do if [ -d root/$$subdir ]; then \
+		pkgproto root/$$subdir=$$subdir >> prototype;\
+	fi; done
+	for file in pkginfo preinstall postinstall copyright; \
+	do if [ -f $$file ]; then \
+		echo "i $$file=$$file" >> prototype; \
+	fi; done
+	rm -rf ./tmp
+	mkdir ./tmp
+	pkgmk -o -d ./tmp
+	pkgtrans -so ./tmp ${top_srcdir}/../${PKGADD_FILE} ${PKGADD_PKG}
--- a/packages/Win32/README
+++ b/packages/Win32/README
@@ -2,6 +2,9 @@ Author: J

 DESCRIPTION

+(If you're only looking for precompiled win32 binaries, go visit
+http://curl.haxx.se/download.html)
+
 Packaging of the curl binaries for Win32 should at this point in time be based
 on the InfoZip (zip/unzip) archiver family as the de-facto standard for
 Windows archives. A package should contain the main binary curl.exe along with
--- a/8
+++ b/8
@@ -9,7 +9,7 @@ die(){
 	echo "$@" ; exit
 }

-aclocal -I .	|| die "ahhhhh"
-autoheader	|| die "ahhhhh"
-automake	|| die "ahhhhh"
-autoconf	|| die "ahhhhh"
+aclocal -I . || die "The command 'aclocal -I .' failed"
+autoheader   || die "The command 'autoheader' failed"
+automake     || die "The command 'automake' failed"
+autoconf     || die "The command 'autoconf' failed"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ CLEANFILES = hugehelp.c
 NROFF=@NROFF@

 EXTRA_DIST = mkhelp.pl config-win32.h \
-	Makefile.vc6 Makefile.b32 Makefile.m32
+	Makefile.vc6 Makefile.b32 Makefile.m32 config.h.in

 AUTOMAKE_OPTIONS = foreign no-dependencies

--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -1,7 +1,4 @@
-/* src/config.h.  Generated automatically by configure.  */
-/* Define if you have the strcasecmp function.  */
-/*#define HAVE_STRCASECMP 1*/
-
+/* src/config-win32.h.  manually created to look like a config.h.  */
 /* Define if you have the stricmp function.  */
 #define HAVE_STRICMP 1

--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,7 +1,4 @@
 /* src/config.h.  Generated automatically by configure.  */
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
 /* Define cpu-machine-OS */
 #undef OS

--- a/src/main.c
+++ b/src/main.c
@@ -179,6 +179,7 @@ static CURLcode win32_init(void) { return CURLE_OK; }
 */
 CURLcode main_init(void)
 {
+  curl_global_init(CURL_GLOBAL_DEFAULT);
  return win32_init();
 }

@@ -189,6 +190,7 @@ CURLcode main_init(void)
 void main_free(void)
 {
  win32_cleanup();
+  curl_global_cleanup();
 }

 int SetHTTPrequest(HttpReq req, HttpReq *store)
@@ -1291,6 +1293,7 @@ struct ProgressData {
  size_t prev;
  size_t point;
  int width;
+  FILE *out; /* where to write everything to */
 };

 int myprogress (void *clientp,
@@ -1320,7 +1323,7 @@ int myprogress (void *clientp,
    int prevblock = bar->prev / 1024;
    int thisblock = bar->point / 1024;
    while ( thisblock > prevblock ) {
-      fprintf( stderr, "#" );
+      fprintf( bar->out, "#" );
      prevblock++;
    }
  }
@@ -1336,14 +1339,16 @@ int myprogress (void *clientp,
    line[i] = '\0';
    sprintf( format, "%%-%ds %%5.1f%%%%", barwidth );
    sprintf( outline, format, line, percent );
-    fprintf( stderr, "\r%s", outline );
+    fprintf( bar->out, "\r%s", outline );
  }
  bar->prev = bar->point;

  return 0;
 }

-void progressbarinit(struct ProgressData *bar)
+static
+void progressbarinit(struct ProgressData *bar,
+                     struct Configurable *config)
 {
 #ifdef __EMX__
  /* 20000318 mgs */
@@ -1377,6 +1382,7 @@ void progressbarinit(struct ProgressData *bar)
  bar->width = scr_size[0] - 1;
 #endif

+  bar->out = config->errors;
 }

 void free_config_fields(struct Configurable *config)
@@ -1458,7 +1464,7 @@ operate(struct Configurable *config, int argc, char *argv[])
  curl_memdebug("memdump");
 #endif

-  main_init(); /* inits winsock crap for windows */
+  main_init(); /* inits */

  config->showerror=TRUE;
  config->conf=CONF_DEFAULT;
@@ -1830,7 +1836,7 @@ operate(struct Configurable *config, int argc, char *argv[])
         !(config->conf&(CONF_NOPROGRESS|CONF_MUTE))) {
        /* we want the alternative style, then we have to implement it
           ourselves! */
-        progressbarinit(&progressbar);
+        progressbarinit(&progressbar, config);
        curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, myprogress);
        curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &progressbar);
      }
@@ -1901,7 +1907,7 @@ operate(struct Configurable *config, int argc, char *argv[])
  /* cleanup the curl handle! */
  curl_easy_cleanup(curl);

-  main_free(); /* cleanup the winsock stuff for windows */
+  main_free(); /* cleanup */

  return res;
 }
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.7.3"
+#define CURL_VERSION "7.8-pre2"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,10 @@
-EXTRA_DIST = ftpserver.pl httpserver.pl runtests.pl
+EXTRA_DIST = ftpserver.pl httpserver.pl runtests.pl ftpsserver.pl stunnel.pm \
+	getpart.pm

 SUBDIRS = data

+PERLFLAGS = -I$(srcdir)
+
 all:
 install:

@@ -10,11 +13,11 @@ curl:

 test:
 	$(MAKE) -C data test
-	srcdir=$(srcdir) $(PERL) $(srcdir)/runtests.pl
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl

 quiet-test:
 	$(MAKE) -C data test
-	srcdir=$(srcdir) $(PERL) $(srcdir)/runtests.pl -s -a
+	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -s -a

 clean:
 	rm -rf log
--- a/tests/README
+++ b/tests/README
@@ -51,41 +51,30 @@ Logs:
  in the runtests.pl script)

 Data:
-  All test-data are put in the data/ subdirctory.
+  All test-data are put in the data/ subdirctory. Each test is stored in the
+  file named according to the test number.

-  For each tests there exist a few files, all with their own separate and
-  special purpose. Replace N with the test number:
+  The test case file format is simply a way to store different sections within
+  the same physical file. The different sections are to be described here
+  within shortly.

-    nameN.txt: test description as displayed when run

-    commandN.txt: command line options for this test
+TEST CASE NUMBERS

-    protN.txt: the full dump of the protocol communication that curl is
-               expected to use when performing this test
+ So far, I've used this system:

-    replyN.txt: the full dump the server should reply to curl for this test.
-               If the final result that curl should've got is not in this
-               file, you can instead name the file replyN0001.txt. This
-               enables you to fiddle more. ;-) Alas, the server sends the
-               replyN.txt file but checks the result after the test against
-               the *0001.txt file.
+ 1   -  99   HTTP
+ 100 - 199   FTP
+ 200 - 299   FILE
+ 300 - 399   HTTPS
+ 400 - 499   FTPS

-    stdoutN.txt: if this file is present, curl's stdout is compared against
-               this file to see that they're identical. If this is present,
-               curl will not be run with -o but instead all output is compared
-               against this file!
-
-    errorN.txt: if this file is present, it should contain the error number
-               curl is supposed to return when this test is run.
-
-    uploadN.txt: if this file is present, it should contain the same data as
-               the log/upload.N does, after a curl upload has been performed.
-
-    ftpdN.txt: this file may contain instructions how to modify the behaviour
-               of the ftp server. It uses a simple syntax that is left to
-               describe here!
+  ... if we run out of test numbers for a particular protocol, then we need
+  to fix it.

 TODO:

+  * Port old test cases to the new file format
+
  * Make httpserver.pl work when we PUT without Content-Length:
  * Add persistant connection support and test cases
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -2,70 +2,9 @@ all:
 install:

 test:
-	[ -f command1.txt ] || ln -s $(srcdir)/*.txt .
+	[ -f test1 ] || ln -s $(srcdir)/test* .

-EXTRA_DIST = command1.txt error113.txt name17.txt prot8.txt \
-command10.txt  error114.txt name18.txt  prot9.txt \
-command100.txt error115.txt name19.txt  reply1.txt \
-command101.txt error116.txt name2.txt   reply10.txt \
-command102.txt error117.txt name20.txt  reply100.txt \
-command103.txt error118.txt name200.txt reply101.txt \
-command104.txt error119.txt name201.txt reply102.txt \
-command105.txt error19.txt  name21.txt  reply103.txt \
-command106.txt error20.txt  name22.txt  reply104.txt \
-command107.txt error201.txt name23.txt  reply105.txt \
-command108.txt error21.txt  name24.txt  reply106.txt \
-command109.txt error23.txt  name25.txt  reply11.txt \
-command11.txt  error24.txt  name3.txt   reply110.txt \
-command110.txt error25.txt  name4.txt   reply110001.txt \
-command111.txt ftpd113.txt  name5.txt   reply110002.txt \
-command112.txt ftpd114.txt  name6.txt   reply12.txt \
-command113.txt ftpd115.txt  name7.txt   reply13.txt \
-command114.txt ftpd116.txt  name8.txt   reply14.txt \
-command115.txt ftpd117.txt  name9.txt   reply15.txt \
-command116.txt ftpd118.txt  prot1.txt   reply16.txt \
-command117.txt name1.txt    prot10.txt  reply17.txt \
-command118.txt name10.txt   prot100.txt reply2.txt \
-command119.txt name100.txt  prot101.txt reply200.txt \
-command12.txt  name101.txt  prot102.txt reply22.txt \
-command13.txt  name102.txt  prot103.txt reply24.txt \
-command14.txt  name103.txt  prot104.txt reply25.txt \
-command15.txt  name104.txt  prot105.txt reply3.txt \
-command16.txt  name105.txt  prot106.txt reply4.txt \
-command17.txt  name106.txt  prot107.txt reply5.txt \
-command18.txt  name107.txt  prot108.txt reply6.txt \
-command19.txt  name108.txt  prot109.txt reply7.txt \
-command2.txt   name109.txt  prot11.txt  reply8.txt \
-command20.txt  name11.txt   prot110.txt reply9.txt \
-command200.txt name110.txt  prot112.txt stdin17.txt \
-command201.txt name111.txt  prot12.txt  stdout107.txt \
-command21.txt  name112.txt  prot13.txt  stdout108.txt \
-command22.txt  name113.txt  prot14.txt  stdout109.txt \
-command23.txt  name114.txt  prot15.txt  stdout110.txt \
-command24.txt  name115.txt  prot16.txt  stdout112.txt \
-command25.txt  name116.txt  prot17.txt  stdout15.txt \
-command3.txt   name117.txt  prot18.txt  stdout18.txt \
-command4.txt   name118.txt  prot2.txt   upload107.txt \
-command5.txt   name119.txt  prot22.txt  upload108.txt \
-command6.txt   name12.txt   prot3.txt   upload109.txt \
-command7.txt   name13.txt   prot4.txt   upload112.txt \
-command8.txt   name14.txt   prot5.txt \
-command9.txt   name15.txt   prot6.txt \
-error111.txt   name16.txt   prot7.txt \
-command26.txt  prot26.txt     command27.txt  prot27.txt \
-name26.txt     reply26.txt    name27.txt     stdout27.txt \
-command28.txt  name28.txt     prot28.txt     reply28.txt \
-command120.txt  name120.txt     prot120.txt     reply120.txt \
-command121.txt  name121.txt     prot121.txt     reply121.txt \
-command29.txt  error30.txt  name30.txt  prot30.txt   reply30.txt \
-command30.txt  name29.txt   prot29.txt  reply29.txt \
-command31.txt  name32.txt  reply31.txt      reply32.txt \
-command32.txt  prot31.txt  reply310001.txt  reply320001.txt \
-name31.txt     prot32.txt  reply310002.txt  reply320002.txt \
-command33.txt  extra33.txt    name33.txt     prot33.txt     reply33.txt \
-command34.txt prot34.txt reply340001.txt name34.txt reply34.txt \
-command35.txt  name35.txt     prot35.txt     reply35.txt \
-command36.txt  error36.txt  name36.txt  reply36.txt \
-command37.txt  name37.txt  prot37.txt  reply37.txt \
-command38.txt prot38.txt reply380001.txt name38.txt reply38.txt \
-command39.txt prot39.txt reply390001.txt name39.txt reply39.txt reply390002.txt
+EXTRA_DIST = \
+test1    test11   test14   test3    test400  test7    \
+test10   test12   test2    test300  test5    test8    \
+test100  test13   test200  test4    test6    test9    
--- a/tests/data/command1.txt
+++ b/tests/data/command1.txt
@@ -1 +0,0 @@
-http://%HOSTIP:%HOSTPORT/1
--- a/tests/data/command10.txt
+++ b/tests/data/command10.txt
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/we/want/10 -T data/command10.txt
-
-
--- a/tests/data/command100.txt
+++ b/tests/data/command100.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/
--- a/tests/data/command101.txt
+++ b/tests/data/command101.txt
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
-
-
--- a/tests/data/command102.txt
+++ b/tests/data/command102.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/102
--- a/tests/data/command103.txt
+++ b/tests/data/command103.txt
@@ -1,4 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
-
-
-
--- a/tests/data/command104.txt
+++ b/tests/data/command104.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/a/path/103 --head
--- a/tests/data/command105.txt
+++ b/tests/data/command105.txt
@@ -1,2 +0,0 @@
-ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii
-
--- a/tests/data/command106.txt
+++ b/tests/data/command106.txt
@@ -1,2 +0,0 @@
-"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces/and%20things2/106;type=A"
-
--- a/tests/data/command107.txt
+++ b/tests/data/command107.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/107 -T data/reply106.txt
--- a/tests/data/command108.txt
+++ b/tests/data/command108.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T data/reply106.txt -P -
--- a/tests/data/command109.txt
+++ b/tests/data/command109.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/109 -T data/reply106.txt --append
--- a/tests/data/command11.txt
+++ b/tests/data/command11.txt
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/11 -L
-
-
--- a/tests/data/command110.txt
+++ b/tests/data/command110.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/110 -C 20
--- a/tests/data/command111.txt
+++ b/tests/data/command111.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/110 -C 2000
--- a/tests/data/command112.txt
+++ b/tests/data/command112.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/112 -T data/reply106.txt -C 40
--- a/tests/data/command113.txt
+++ b/tests/data/command113.txt
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/113
-
--- a/tests/data/command114.txt
+++ b/tests/data/command114.txt
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/114
-
--- a/tests/data/command115.txt
+++ b/tests/data/command115.txt
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/115
-
--- a/tests/data/command116.txt
+++ b/tests/data/command116.txt
@@ -1,2 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/116 -P -
-
--- a/tests/data/command117.txt
+++ b/tests/data/command117.txt
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/117
-
-
--- a/tests/data/command118.txt
+++ b/tests/data/command118.txt
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/118
-
-
--- a/tests/data/command119.txt
+++ b/tests/data/command119.txt
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/119 -P -
-
-
--- a/tests/data/command12.txt
+++ b/tests/data/command12.txt
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/12 -r 100-200
-
-
--- a/tests/data/command120.txt
+++ b/tests/data/command120.txt
@@ -1,3 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE file"
-
-
--- a/tests/data/command121.txt
+++ b/tests/data/command121.txt
@@ -1 +0,0 @@
-ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE after_transfer" -Q "DELE before_transfer"
--- a/tests/data/command13.txt
+++ b/tests/data/command13.txt
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
-
-
--- a/tests/data/command14.txt
+++ b/tests/data/command14.txt
@@ -1,3 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/14 -i --head
-
-
--- a/tests/data/command15.txt
+++ b/tests/data/command15.txt
@@ -1,4 +0,0 @@
-http://%HOSTIP:%HOSTPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
-
-
-
--- a/tests/data/command16.txt
+++ b/tests/data/command16.txt
@@ -1 +0,0 @@
- -U fake@user:<3A><><EFBFBD>looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HOSTPORT http://we.want.that.site.com/2
--- a/tests/data/command17.txt
+++ b/tests/data/command17.txt
@@ -1 +0,0 @@
-K - %HOSTIP:%HOSTPORT/that.site.com/17
--- a/tests/data/command18.txt
+++ b/tests/data/command18.txt
@@ -1 +0,0 @@
-'%HOSTIP:%HOSTPORT/{3,10,11}'
--- a/tests/data/command19.txt
+++ b/tests/data/command19.txt
@@ -1 +0,0 @@
-%HOSTIP:60000
--- a/tests/data/command2.txt
+++ b/tests/data/command2.txt
@@ -1 +0,0 @@
- -u fake:user http://%HOSTIP:%HOSTPORT/2
--- a/tests/data/command20.txt
+++ b/tests/data/command20.txt
@@ -1 +0,0 @@
-weeeeeeirdname
--- a/tests/data/command200.txt
+++ b/tests/data/command200.txt
@@ -1,2 +0,0 @@
-file://data/reply200.txt
-
--- a/tests/data/command201.txt
+++ b/tests/data/command201.txt
@@ -1,2 +0,0 @@
-file://data/fooobar-reply201.txt
-
--- a/tests/data/command21.txt
+++ b/tests/data/command21.txt
@@ -1 +0,0 @@
-I -X FOOO
--- a/tests/data/command22.txt
+++ b/tests/data/command22.txt
@@ -1,2 +0,0 @@
-%HOSTIP:%HOSTPORT/`perl -e 'print "a" x 10000;'`/17
-
--- a/tests/data/command23.txt
+++ b/tests/data/command23.txt
@@ -1 +0,0 @@
-htfp://%HOSTIP:%HOSTPORT/none.htfml
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Stenberg	fbca7a83fc	7.8-pre2	2001-05-30 11:24:26 +00:00
Daniel Stenberg	870bacd689	include strtok.h to get the prototype	2001-05-30 11:06:56 +00:00
Daniel Stenberg	d9f39cc99b	finally fixed the 'ret' compiler warning	2001-05-30 11:06:33 +00:00
Daniel Stenberg	f2e6d235f2	removed python interface, there is one now! ;-)	2001-05-30 10:42:18 +00:00
Daniel Stenberg	baa220c1af	-# fix, thread fix, easy.c compile fix and more	2001-05-30 10:34:14 +00:00
Daniel Stenberg	cabef4732d	made the automake line re-build from _all_ Makefile.am files in the source tree	2001-05-30 10:29:39 +00:00
Daniel Stenberg	cab90bf98a	english fix	2001-05-30 08:01:35 +00:00
Daniel Stenberg	ab449cce73	now uses CURL_GLOBAL_DEFAULT	2001-05-30 08:01:09 +00:00
Daniel Stenberg	b541537c66	curl_global_init() support for CURL_GLOBAL_NOT_SSL	2001-05-30 08:00:29 +00:00
Daniel Stenberg	285e998fae	Sterling Hughes's fixes	2001-05-30 07:59:47 +00:00
Cris Bailiff	c503930b8d	Added Solaris 'pkgadd' building support to packages collection and autoconf/automake files	2001-05-30 04:31:32 +00:00
Daniel Stenberg	5c6859e537	not used in autoconf version 2.50	2001-05-29 19:28:50 +00:00
Daniel Stenberg	4e376a2f1a	check for strtok_r	2001-05-29 19:25:28 +00:00
Daniel Stenberg	edd608aa76	curl_ => Curl_	2001-05-29 19:20:37 +00:00
Daniel Stenberg	88d536eb3b	re-indented to follow "project curl"-style, renamed curl_ prefix to Curl_	2001-05-29 19:20:21 +00:00
Daniel Stenberg	d567659bf4	strtok() replaced with strtok_r()	2001-05-29 19:17:39 +00:00
Daniel Stenberg	e0558ae541	adjusted for automake 1.4+	2001-05-29 19:17:19 +00:00
Daniel Stenberg	034f6378da	Added strtok.[ch]	2001-05-29 19:17:03 +00:00
Daniel Stenberg	af129c499e	we rqeuire autoconf 2.50 now	2001-05-29 19:14:46 +00:00
Daniel Stenberg	8b4809a898	fixed the -# to write to the same as --stderr is set to	2001-05-29 18:30:47 +00:00
Daniel Stenberg	88d14e96ca	3.11 How do I POST with a different Content-Type?	2001-05-29 14:02:20 +00:00
Daniel Stenberg	04d1491a6b	clarified the MUTE option	2001-05-29 13:28:03 +00:00
Daniel Stenberg	de16ddd5b4	updated, improved language at a few places	2001-05-29 13:23:41 +00:00
Daniel Stenberg	27751df6ec	moved list of authors to the separate THANKS file and added that to the release archive	2001-05-29 12:09:47 +00:00
Daniel Stenberg	cf02eb11f6	text: added in 7.8	2001-05-29 12:09:15 +00:00
Daniel Stenberg	22b8d387bc	beauty fix	2001-05-29 08:27:43 +00:00
Daniel Stenberg	bfd89c8078	global_init() takes that flag argument	2001-05-29 07:20:31 +00:00
Daniel Stenberg	223c48e6b5	7.8-pre1 commit	2001-05-28 21:50:00 +00:00
Daniel Stenberg	7bb7550e23	fixes	2001-05-28 21:49:45 +00:00
Daniel Stenberg	adf00f5b2e	added libtool	2001-05-28 21:49:01 +00:00
Daniel Stenberg	0844c4fdb2	major: curl_general_init/cleanup	2001-05-28 21:45:36 +00:00
Daniel Stenberg	38cabc4fdb	ftps:// works	2001-05-28 21:45:10 +00:00
Daniel Stenberg	ec340e3e33	adjusted the global_init() call to pass the new flag argument too	2001-05-28 15:31:12 +00:00
Daniel Stenberg	f44f512f24	global_init() takes a flag option now, to tell libcurl what _not_ to init. it will make it better when the application uses several libs that use openssl and it also enables us to do the win32 winsock initing in the future if we want to	2001-05-28 15:30:38 +00:00
Daniel Stenberg	ce0e2cc017	better -v use, passes -I to all perl invokes	2001-05-28 15:26:15 +00:00
Daniel Stenberg	b082832220	added calls to curl_global_*, they aren't really needed for this application but it shows good manner to always cleanup	2001-05-28 15:06:46 +00:00
Daniel Stenberg	1e5e0f9a26	added 'curl-config --vernum' for hardcore hex version output	2001-05-28 14:58:07 +00:00
Daniel Stenberg	ac3ae8f775	changed the check for command1.txt to test1, so that automatic testing in 'make distcheck' will work	2001-05-28 14:32:05 +00:00
Daniel Stenberg	a51fd91db2	increased interface age	2001-05-28 14:12:58 +00:00
Daniel Stenberg	d300cf4d84	T. Bharath's comments about SSL cleanup incorporated, and the two new curl_global_* functions	2001-05-28 14:12:43 +00:00
Daniel Stenberg	a9d0a85842	curl_global_cleanup and curl_global_init added to the family	2001-05-28 14:11:02 +00:00
Daniel Stenberg	81da4fc995	Added more test cases	2001-05-28 12:31:07 +00:00
Daniel Stenberg	b6ca1be1cd	test case converted to the new file format	2001-05-28 12:30:21 +00:00
Daniel Stenberg	20d67917c4	test: HTTP over proxy	2001-05-28 11:19:44 +00:00
Daniel Stenberg	915b10052c	Removed references to the previous file format, added some tests about the new format but there's still much more to be said and done	2001-05-23 15:05:43 +00:00
Daniel Stenberg	d3516810a7	adjusted to the new test case formats	2001-05-23 15:02:58 +00:00
Daniel Stenberg	68af9a222e	Removed the former files using the old-style test case format, added the new ones. Many more of the old ones must be "ported" to this new format to make the test suite complete again.	2001-05-23 15:02:24 +00:00
Daniel Stenberg	58c3bdc1a4	new test case file format	2001-05-23 15:00:48 +00:00
Daniel Stenberg	72dec6cfec	Added Andres' comments about field 2 in netscape cookie files	2001-05-23 13:04:19 +00:00
Daniel Stenberg	8dc9f4330c	Andr�s Garc�a's netscape cookie file parser fix	2001-05-23 09:26:45 +00:00
Daniel Stenberg	c77f77a1ce	general autoconf and automake fixes	2001-05-22 21:17:58 +00:00
Daniel Stenberg	2966ef6661	store httpcode _before_ doing the FAILONERROR check so that getinfo works afterwards (bug #426442)	2001-05-22 21:09:09 +00:00
Daniel Stenberg	93c53424c8	cleanup commit for new autoconf+automake+libtool versions	2001-05-22 18:16:24 +00:00
Daniel Stenberg	4a2812c5e8	fixes and improvments	2001-05-22 12:05:05 +00:00
Daniel Stenberg	4852a4930c	turned newlines into DOS styles	2001-05-21 21:45:11 +00:00
Daniel Stenberg	b555ca5baa	made it binary in CVS to maintain DOS newlines and turned those newlines into the DOS kind!	2001-05-21 21:42:38 +00:00
Daniel Stenberg	4a6eaf1b95	Added text about the test case numbering	2001-05-21 13:40:54 +00:00
Daniel Stenberg	a8bc40fe4e	doesn't run ssl tests if libcurl wasn't built with ssl support (and reports about the libcurl SSL status)	2001-05-21 13:38:38 +00:00
Daniel Stenberg	1b9e26a287	added a lame double-check for libcrypto as otherwise it wouldn't get added properly! (?) Anyone has any better solution then please step forward!	2001-05-21 13:33:03 +00:00
Daniel Stenberg	9f24645a5b	Added test case 400, the first ftps:// one	2001-05-21 13:31:49 +00:00
Daniel Stenberg	441a957d57	ftps test case data	2001-05-21 13:31:05 +00:00
Daniel Stenberg	adc0edc44b	slightly "hackish" approach to disable SSL during download if the connection is a FTPS connection as the data transfer is then done unencrypted!	2001-05-21 13:30:01 +00:00
Daniel Stenberg	4836154cef	this should not set a SSL path to LDFLAGS or CPPFLAGS unless it really needs to	2001-05-18 14:42:41 +00:00
Daniel Stenberg	0058e87ed5	added some, removed some, moved around some.	2001-05-18 12:55:13 +00:00
Daniel Stenberg	23903306a7	nicer OpenSSL header check	2001-05-18 12:36:38 +00:00
Daniel Stenberg	49b9926d5a	our internal strlcat() is now named Curl_strlcat()	2001-05-18 12:03:30 +00:00
Daniel Stenberg	6c50d2ee7d	strlcat() is now Curl_strlcat() instead to prevent collisions when used with other libs	2001-05-18 10:02:44 +00:00
Daniel Stenberg	9e8615ae1d	strlcpy() turned static	2001-05-18 10:02:12 +00:00
Daniel Stenberg	bb51c20c8b	Added #define CURLE_ALREADY_COMPLETE to not break compiles that use that symbol, but libcurl will not return this ever	2001-05-16 14:45:50 +00:00
Daniel Stenberg	a84af986fd	added pointer to the examples/getinmemory.c source code for paragraph 5.2 "How can I receive all data into a large memory chunk?"	2001-05-15 13:09:27 +00:00
Daniel Stenberg	3ab3be1b6e	Added getinmemory.c	2001-05-15 13:08:23 +00:00
Daniel Stenberg	3ceb2bcbb9	this might actually compile too...	2001-05-15 13:04:53 +00:00
Daniel Stenberg	2457a31948	an example on how you can use the write callback to receive data in a memory chunk	2001-05-15 13:03:53 +00:00
Daniel Stenberg	9e1e318691	We need -lpthread for the pthread example	2001-05-15 12:56:38 +00:00
Daniel Stenberg	e1132ecbe6	corrected	2001-05-15 12:55:35 +00:00
Daniel Stenberg	ccb92f1a8a	Added Pawel A. Gajda	2001-05-15 11:00:29 +00:00
Daniel Stenberg	8526fa97ce	Pawel A. Gajda fixed resumed transfers on persistent connections	2001-05-15 07:21:13 +00:00
Daniel Stenberg	f85c29aad8	Added the first https test: 300	2001-05-14 12:25:04 +00:00
Daniel Stenberg	4677f733b2	pid files fixes, ftp server already-running-but-no-control check	2001-05-14 12:09:47 +00:00
Daniel Stenberg	e82d2dc634	Jun-ichiro itojun Hagino fixed FTP PORT for IPv6-enabled libcurl	2001-05-14 11:29:47 +00:00
Daniel Stenberg	b56f1e5185	added a pointer to the download web page	2001-05-14 07:08:22 +00:00
Daniel Stenberg	c7c942861a	Added tons of comments all over	2001-05-12 16:11:14 +00:00
Daniel Stenberg	a50fac0e63	multiple transfer path fixes, location fixes, resume download changes, ssl peer verify fixes and more	2001-05-12 09:49:04 +00:00
Daniel Stenberg	e0f56897d5	CURLE_ALREADY_COMPLETE is removed CURLE_SSL_PEER_CERTIFICATE is added	2001-05-12 09:37:51 +00:00
Daniel Stenberg	c7dbde9f3f	Uses the Curl_SSLConnect() according to the new return type	2001-05-12 09:30:42 +00:00
Daniel Stenberg	8fd89d6b93	fixed Curl_SSLConnect() to return CURLcode errors, including the new error code for peer certificate errors	2001-05-12 09:29:56 +00:00
Daniel Stenberg	632e951e14	changed wording to make it more obvious I don't continuously work on this.	2001-05-11 14:07:58 +00:00
Daniel Stenberg	a3a2d200fa	two new FTP file transfer resume test cases added	2001-05-11 11:40:52 +00:00
Daniel Stenberg	4c2ca97d6d	removed unused #ifdef'ed section	2001-05-11 11:38:42 +00:00
Daniel Stenberg	11f2464a22	when asking for a resumed FTP transfer, even though the entire file has already been transfered no longer returns error but instead is OK. The reasoning behind this is of course that no extra actions need to be taken and it is as if a transfer had been successfully performed.	2001-05-11 11:38:13 +00:00
Daniel Stenberg	291075b12f	checkheader() added to check headers+contents instead of the previous strnequal() approach that really didn't follow the RFC properly	2001-05-11 07:52:58 +00:00
Daniel Stenberg	282939c6fe	another multiple FTP transfer fix	2001-05-11 06:40:04 +00:00
Daniel Stenberg	fef1fc0d32	Ingo Wilken's redirect fixes	2001-05-11 06:10:48 +00:00
Daniel Stenberg	dc6da007ad	Ingo Wilken's patch to support multiple spaces after "Location:"	2001-05-10 11:29:47 +00:00
Daniel Stenberg	7be8993f94	When re-using a connection, the path pointers were not setup properly so that multiple FTP transfers were not possible	2001-05-10 09:31:48 +00:00
Daniel Stenberg	bad4c8967b	added ftpsserver.pl stunnel.pm	2001-05-10 07:51:29 +00:00
Daniel Stenberg	4dbac041f1	removed some texts like "starting with version XXX" blabla	2001-05-08 12:39:40 +00:00
Daniel Stenberg	dd344b65f2	made clear that the cookie file format understood is Netscape _and_ Mozilla	2001-05-08 12:30:37 +00:00
Daniel Stenberg	5c25c7bbfa	when getting a FTP file with NOBODY, we will no longer return error if SIZE doesn't work, we just don't output any size info!	2001-05-08 12:10:14 +00:00
Daniel Stenberg	a6d9ccf66b	Added stunnel.pem	2001-05-07 21:25:37 +00:00
Daniel Stenberg	89ba66e071	corrected the read-callback typecase since FILE * was replaced with void *	2001-05-07 12:38:28 +00:00
Daniel Stenberg	85631150ce	fixed 'storefread' to not make a warning	2001-05-07 11:17:18 +00:00
				`@@ -1,3 +0,0 @@`
				`http://%HOSTIP:%HOSTPORT/we/want/10 -T data/command10.txt`
				`@@ -1,2 +0,0 @@`
				`ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii`
				`@@ -1,2 +0,0 @@`
				`"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces/and%20things2/106;type=A"`
				`@@ -1 +0,0 @@`
				`ftp://%HOSTIP:%FTPPORT/107 -T data/reply106.txt`
				`@@ -1 +0,0 @@`
				`ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T data/reply106.txt -P -`
				`@@ -1 +0,0 @@`
				`ftp://%HOSTIP:%FTPPORT/109 -T data/reply106.txt --append`
				`@@ -1 +0,0 @@`
				`ftp://%HOSTIP:%FTPPORT/112 -T data/reply106.txt -C 40`
				`@@ -1,3 +0,0 @@`
				`http://%HOSTIP:%HOSTPORT/want/12 -r 100-200`
				`@@ -1,3 +0,0 @@`
				`ftp://%HOSTIP:%FTPPORT/106 -Q "-DELE file"`