curl 7.7.2

same name in that buffer from the URL parsing!

CHANGES

@@ -6,6 +6,266 @@
 
                                History of Changes
 
+Version 7.7.2
+
+Daniel (22 April 2001)
+- Rosimildo da Silva updated the Makefiles for Borland/Windows.
+
+- Eric Rautman pointed out a problem with persistent connections that would
+  lead to broken Host: headers in the second HTTP request.
+
+Daniel (20 April 2001)
+- Added man pages for the curl_strequal() and curl_mprintf() families. Wrote
+  a 'libcurl overview' man page.
+
+- Spell-fixed some documents.
+
+- S. Moonesamy corrected mistakes in the man page.
+
+- Cris Bailiff fixed the curl_slists options in the perl interface, present
+  separately in the Curl::easy 1.1.4 package.
+
+Daniel (19 April 2001)
+- Linus Nielsen Feltzing removed the decimals from the size variables in the
+  --write-out output. We hardly ever get fraction of bytes! :-)
+
+Version 7.7.2-pre1
+
+Daniel (19 April 2001)
+
+- Albert Chin provided a configure patch for the AC_SYS_LARGEFILE macro.
+
+Daniel (18 April 2001)
+- Input from Michael Mealling made me add --feature to curl-config. It
+  displays a list of features that have been built-in in the current
+  libcurl. The currently available features that can be listed are: SSL, KRB4
+  and IPv6.
+
+- I committed Cris and Georg's perl interface work. They've got callbacks
+  working and options that receives those slist pointers.
+
+- Puneet Pawaia detected a problem with resumed downloads that use persistent
+  connections and I made a rather large writeup to correct this. It is
+  important that all session-data is stored in the connectdata struct and not
+  in the main struct as this previously did.
+
+Daniel (17 April 2001)
+- Frederic Lepied fixed a ftp resumed download problem and introduced a new
+  error code that lets applications be able to detect when a resumed download
+  actually didn't download anything since the whole file is already present.
+  Should this return OK instead?
+
+- I added 'curl-config.in' to the root dir and configure script. Now, a
+  curl-config script is made when curl is built. The script can be used to
+  figure out compile time options used when libcurl was built, which in turn
+  should be options YOU should use to build applications that use libcurl.
+
+  This *-config style is not a new idea, but something that has been used
+  successfully in other (library based) projects.
+
+- Phil Karn pointed out that libcurl wrongly did not always use GMT time zone
+  for the If-Modified-Since style headers.
+
+- Georg Schwarz pointed out an extra needed #include file needed in src/main.c
+  for curl to build on Ultrix.
+
+Daniel (11 April 2001)
+- Cris Bailiff pointed out two problems that I corrected. First, libcurl's use
+  of the environment variable HTTP_PROXY in uppercase may become a security
+  hazard when people use libcurl in a server/cgi situation where the server
+  sets the HTTP_*-variables according to incoming headers in the HTTP
+  request. Thus, a "Proxy:"-header would set that environment variable!
+
+  Then, invoking curl_easy_perform() without having an URL set caused a crash.
+
+- S. Moonesamy brought a patch that make curl use non-blocking connects on
+  windows when connection timeout is set, as it allows windows users to set
+  that timeout!
+
+- Hirotaka Matsuyuki wrote a Ruby interface to libcurl!
+
+- Cris Bailiff, Forrest Cahoon and Georg Horn work on the Perl interface.
+
+- I've written a first shot at a Java interface to libcurl. Many thanks to
+  Daniel Marell for tirelessly answering to all my basic Java questions. It
+  works, but it is still very basic.
+
+Daniel (10 April 2001)
+- The progress display could get silly when doing multiple file transfers, as
+  it wasn't properly reset between transfers!
+
+- Discussions with Cris Bailiff who writes a Perl interface to libcurl, made
+  me add CURLOPT_HEADERFUNCTION. It can be used to set a separate callback
+  function for writing headers. Previously you could only set a different FILE
+  * when headers are written from within libcurl.
+
+Daniel (7 April 2001)
+- Andr<64>s Garc<72>a fixed a problem in curl_escape() and pointed out a flaw in
+  the curl_easy_setopt man page.
+
+Daniel (6 April 2001)
+- Adjusted the version code to properly display OpenSSL 0.9.6a. They sure
+  change their version define format often...
+
+- curl_formfree() now accepts a NULL pointer without crashing!
+
+Version 7.7.1
+
+Daniel (3 April 2001)
+- Puneet Pawaia pointed out two serious problems. Libcurl would attempt to
+  read bad memory during situations when an (ftp) connection attempt failed.
+  Also, the lib/Makefile.vc6 was corrected.
+
+- More investigations in the Location: following code made me realize that
+  it was not clean enough to work transparantly with persistent and non-
+  persistent connections. I think I've fixed it now.
+
+Daniel (29 March 2001)
+- Georg Horn mailed me some corrections for the Curl::easy perl interface.
+
+- Experimental ftps:// support added. It is basically FTP over SSL for the
+  control connection. It still makes all data transfers going over unencrypted
+  connections. Rainer Weikusat's ftpd-ssl server hack supports this and I used
+  that to verify the functionality.
+
+Daniel (27 March 2001)
+- Guenole Bescon discovered that if you set a CURLOPT_TIMEOUT and then tried
+  to get a file from a site and it fails, the SIGALRM would still be sent
+  after the timeout-time, quite inexpectedly!
+
+- I added an ftp transfer example to docs/examples/ and I also wrote a tiny
+  example makefile that can be used as a start when building one of the
+  examples.
+
+Version 7.7.1-beta1
+
+Daniel (26 March 2001)
+- Mohamed Lrhazi reported problems with 7.6.1 and persistent HTTP/1.0
+  connections (when the server replied a Connection: Keep-Alive) and this
+  problem was not properly dealt with in 7.7 either. A patch was posted to the
+  curl-and-php mailing list.
+
+Daniel (24 March 2001)
+- Colin Watson reported about a problem and brought a patch that corrected it,
+  which was about the man page and lines starting with a single quote (') in a
+  way that gnroff doesn't like.
+
+Daniel (23 March 2001)
+- Peter Bray reported correctly that the root makefile used make instead of
+  $(MAKE) for the test target.
+
+- Corrected the Curl::easy perl interface to use curl_easy_setopt() and not
+  curl_setopt() which was removed in 7.7!
+
+- S. Moonesamy provided updates on three documents (MANUAL, INSTALL and FAQ).
+
+- When following a Location:, libcurl would sometimes write to the URL string
+  in a way it shouldn't. As the pointer is passed-in to libcurl from an
+  application, we can't be allowed to write to it. The particular bug report
+  from 'nk' that brought this up was because he had a read-only URL that then
+  caused a libcurl crash!
+
+- No longer reads HEAD responses longer than to the last header. Previously,
+  curl would read the full reply if the connection was a "close" one.
+
+- libcurl did re-use connections way too much. Doing "curl
+  http://www.{microsoft,ibm}.com" would make it re-use the connection which
+  made the second request return very odd results.
+
+Daniel (22 March 2001)
+- Edin Kadribasic made me aware that curl should not re-send POST requests
+  when following 302-redirects. I made 302 work like 303 which means curl uses
+  GET in the following request(s).
+
+- libcurl now reset the "followed-location" counter on each invoke of
+  curl_easy_perform() as it otherwise would sum up all redirects on the same
+  connection and thus could reach the maxredirs counter wrongly.
+
+- Jim Drash suggested curl_escape() should not re-encode what already looks
+  like an encoded sequence and I think that's a fair suggestion.
+
+Version 7.7
+
+Daniel (22 March 2001)
+- The configure script now fails with an error message if gethostbyname_r() is
+  detected but it couldn't figure out how to invoke it (what amount of
+  arguments it is supposed to get). Reports from Andr<64>s Garc<72>a made me aware
+  of this need.
+
+- Talking with Jim Drash made me finally put the curl_escape and curl_unescape
+  functions in the curl.h include file and write man pages for them. The
+  escape function was modified to use the same interface as the unescape one
+  had.
+
+- No bug reports at all on the latest betas. Release time coming up.
+
+Version 7.7-beta5
+
+Daniel (19 March 2001)
+- Georg Ottinger reported problems with using -C together with -L in the sense
+  that the -C info got lost when it was redirected. I could not repeat this
+  problem on the 7.7 branch why I leave this for the moment. Test case 39 was
+  added to do exactly this, and it seems to do right.
+
+- Christian Robottom Reis reported how his 7.7 beta didn't successfully do
+  form posts as elegantly as 7.6.1 did. Indeed, this was a flaw in the header
+  engine, as HTTP 1.1 has introduced a new 100 "transient" return code for PUT
+  and POST operations that I need to add support for. Section 8.2.3 in RFC2616
+  has all the details. Seems to work now!
+
+Daniel (16 March 2001)
+- After having experienced another machine break-down, we're back.
+
+- Georg Horn's perl interface Curl::easy is now included in the curl release
+  archive. The perl/ directory is now present. Please help me with docs,
+  examples and updates you think fit.
+
+- Made a new php/ directory in the release archive and moved the PHP examples
+  into a subdirectory in there. Not much PHP info yet, but I plan to. Please
+  help me here as well!
+
+- Made libcurl return error if a transfer is aborted in the middle of a
+  "chunk". It actually enables libcurl to discover premature transfer aborts
+  even if the Content-Length: size is unknown.
+
+Daniel (15 March 2001)
+- Added --connect-timeout to curl, which sets the new CURLOPT_CONNECTTIMEOUT
+  option in libcurl. It limits the time curl is allowed to spend in the
+  connection phase. This differs from -m/--max-time that limits the entire
+  file transfer operation. Requested by Larry Fahnoe and others.
+
+  I also updated the curl.1 and curl_easy_setopt.3 man pages and removed the
+  item from the TODO.
+
+Version 7.7-beta4
+
+Daniel (14 March 2001)
+- Made curl grok IPv6 with HTTP proxies and got everything to compile nicely
+  again when ENABLE_IPV6 is set.
+
+  I need to remake things in the test suite. I can't test the FTP parts with
+  curl built for IPv6 as it uses a different set of FTP commands then!
+
+- I fell onto a bug report on php.net (posted by Lars Torben Wilson) that was
+  a report meant for our project. Anyway, it said the .netrc parsing didn't
+  work as supposed, and as I agreed with Lars, I made the netrc parser use
+  getpwuid() to figure out the home directory of the effective user and try
+  that netrc. It still uses the environment variable HOME for those that don't
+  have that function or if the user doesn't return valid pwd info.
+
+- Edin Kadribaic posted a bug report where he got a crash when a fetch with
+  user+password in the URL followed a Location: to a second URL (absolute,
+  without name+password). This bug has been around for a long while and
+  crashes due to a read at address zero. Fixed now. Wrote test case 38, that
+  tests this.
+
+- Modified the test suite's httpserver slightly to append all client request
+  data to its log file so that the test script now better can verify a range
+  of requests and not only the last one, as it did previously.
+
+- Updated the curl man page with --random-file and --egd-file details.
+
+Version 7.7-beta3
 
 Daniel (14 March 2001)
 - Bj<42>rn Stenberg provided similar fixes as J<>rn did and some additional patches
@@ -62,14 +322,14 @@ Daniel (12 March 2001)
   test cases.
 
 - Added 5 new libcurl options to curl/curl.h that can be used to control the
-  persistant connection support in libcurl. They're also documented (fairly
+  persistent connection support in libcurl. They're also documented (fairly
   thoroughly) in the curl_easy_setopt.3 man page. Three of them are now
   implemented, although not really tested at this point... Anyway, the new
   implemented options are named CURLOPT_MAXCONNECTS, CURLOPT_FRESH_CONNECT,
   CURLOPT_FORBID_REUSE. The ones still left to write code for are:
   CURLOPT_CLOSEPOLICY and its related option CURLOPT_CLOSEFUNCTION.
 
-- Made curl (the actual command line tool) use the new libcurl 7.7 persistant
+- Made curl (the actual command line tool) use the new libcurl 7.7 persistent
   connection support by re-using the same curl handle for every specified file
   transfer and after some more test case tweaking we have 100% test case OK.
   I made some test cases return HTTP/1.0 now to make sure that works as well.
@@ -89,7 +349,7 @@ Daniel (12 March 2001)
   of different HTTP proxies before I feel safe.
 
   Now I'm facing the problem with my test suite servers (both FTP and HTTP)
-  not supporting persistant connections and libcurl is doing them now. I have
+  not supporting persistent connections and libcurl is doing them now. I have
   to fix the test servers to get all the test cases do OK.
 
 Daniel (8 March 2001)
@@ -130,7 +390,7 @@ Daniel (2 March 2001)
 - Now they work intermixed as well. Major coolness!
 
 - More fiddling around, my 'tiny' client I have for testing purposes now has
-  proved to download both FTP and HTTP with persistant connections. They do
+  proved to download both FTP and HTTP with persistent connections. They do
   not work intermixed yet though.
 
 Daniel (1 March 2001)
@@ -139,7 +399,7 @@ Daniel (1 March 2001)
   now.
 
 Daniel (22 February 2001)
-- The persistant connections start to look good for HTTP. On a subsequent
+- The persistent connections start to look good for HTTP. On a subsequent
   request, it seems that libcurl now can pick an already existing connection
   if a suitable one exists, or it opens a new one.
 
@@ -164,7 +424,7 @@ Daniel (20 February 2001)
   mailing lists for discussions around how this is gonna be implemented. Docs
   and more will follow.
 
-  Studied the HTTP RFC to find out better how persistant connections should
+  Studied the HTTP RFC to find out better how persistent connections should
   work. Seems cool enough.
 
 Daniel (19 February 2001)
@@ -183,9 +443,9 @@ Daniel (15 February 2001)
   string switches off the POST again.
 
 - Excellent suggestions from Rich Gray, Rick Jones, Johan Nilsson and Bjorn
-  Reese helped me define a way how to incorporate persistant connections into
+  Reese helped me define a way how to incorporate persistent connections into
   libcurl in a very smooth way. If done right, no change may have to be made
-  to older programs and they will just start using persistant connections when
+  to older programs and they will just start using persistent connections when
   applicable!
 
 Daniel (13 February 2001)
@@ -219,16 +479,16 @@ Daniel (8 February 2001)
 Version 7.6.1-pre3
 
 Daniel (7 February 2001)
-- SM found a flaw in the response reading function for FTP that could make
-  libcurl not get out of the loop properly when it should, if libcurl got -1
-  returned when reading the socket.
+- S. Moonesamy found a flaw in the response reading function for FTP that
+  could make libcurl not get out of the loop properly when it should, if
+  libcurl got -1 returned when reading the socket.
 
 - I found a similar mistake in http.c when using a proxy and reading the
   results from the proxy connection.
 
 Daniel (6 February 2001)
-- A friendly person named "SM" (nntp at iname.com) pointed out that the VC
-  makefile in src/ needed the libpath set for the debug build to work.
+- S. Moonesamy pointed out that the VC makefile in src/ needed the libpath set
+  for the debug build to work.
 
 - Daniel Gehriger stepped in to assist with the VC++ stuff Robert Weaver
   brought up yesterday.

CVS-INFO

@@ -1,16 +1,27 @@
-This file is only present in the CVS - never in release archives.
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
 
-This contains information about other files and things that the CVS repository
-keeps in its inner sanctum.
+CVS-INFO
 
-CHANGES.0     contains ancient changes.
+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.
 
-memanalyze.pl is for analyzing the output generated by curl if -DMALLOCDEBUG
-              is used when compiling
 
-Makefile.dist is included as the root Makefile in distribution archives
 
-perl/         is a subdirectory with various perl scripts
+  CHANGES.0     contains ancient changes.
+
+  memanalyze.pl is for analyzing the output generated by curl if -DMALLOCDEBUG
+                is used when compiling
+
+  Makefile.dist is included as the root Makefile in distribution archives
+
+  perl/contrib/ is a subdirectory with various perl scripts
+
+  java          is a subdirectory with the Java interface to libcurl
 
 To build after having extracted everything from CVS, do this:
 

Makefile.am

@@ -8,7 +8,9 @@ EXTRA_DIST = \
 	CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \
 	config-win32.h reconf packages/README Makefile.dist
 
-SUBDIRS = docs lib src include tests packages
+bin_SCRIPTS = curl-config
+
+SUBDIRS = docs lib src include tests packages perl php
 
 # create a root makefile in the distribution:
 dist-hook:
@@ -17,7 +19,7 @@ dist-hook:
 check: test
 
 test:
-	@(cd tests; make quiet-test)
+	@(cd tests; $(MAKE) quiet-test)
 
 #
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros

Makefile.dist

@@ -30,16 +30,16 @@ ssl:
 	make
 
 borland:
-	cd lib; make -f Makefile.b32
-	cd src; make -f Makefile.b32
+	cd lib & make -f Makefile.b32
+	cd src & make -f Makefile.b32
 
 mingw32:
-	cd lib; make -f Makefile.m32
-	cd src; make -f Makefile.m32
+	cd lib & make -f Makefile.m32
+	cd src & make -f Makefile.m32
 
 mingw32-ssl:
-	cd lib; make -f Makefile.m32 SSL=1
-	cd src; make -f Makefile.m32 SSL=1
+	cd lib & make -f Makefile.m32 SSL=1
+	cd src & make -f Makefile.m32 SSL=1
 
 vc:
 	cd lib

acinclude.m4

@@ -1,4 +1,4 @@
-#serial 12
+#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.
@@ -11,7 +11,14 @@ dnl Internal subroutine of AC_SYS_LARGEFILE.
 dnl AC_SYS_LARGEFILE_TEST_INCLUDES
 AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
   [[#include <sys/types.h>
-    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+    /* 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.
@@ -19,14 +26,11 @@ dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, F
 AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
   [AC_CACHE_CHECK([for $1 value needed for large files], $3,
      [$3=no
-      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
-$5
-        ,
+      AC_TRY_COMPILE([$5],
 	[$6], 
 	,
 	[AC_TRY_COMPILE([#define $1 $2]
-AC_SYS_LARGEFILE_TEST_INCLUDES
-$5
+[$5]
 	   ,
 	   [$6],
 	   [$3=$2])])])
@@ -35,7 +39,8 @@ $5
    fi])
 
 AC_DEFUN(AC_SYS_LARGEFILE,
-  [AC_ARG_ENABLE(largefile,
+  [AC_REQUIRE([AC_PROG_CC])
+   AC_ARG_ENABLE(largefile,
      [  --disable-largefile     omit support for large files])
    if test "$enable_largefile" != no; then
 
@@ -58,18 +63,30 @@ AC_DEFUN(AC_SYS_LARGEFILE,
 
      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_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
-       ac_cv_sys_largefile_source,
-       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
-       [#include <stdio.h>], [return !ftello;])
+       [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.])
-dnl	lftp does not need ftello, and _XOPEN_SOURCE=500 makes resolv.h fail.
-dnl     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
-dnl       ac_cv_sys_xopen_source,
-dnl       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
-dnl       [#include <stdio.h>], [return !ftello;])
+       [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])

configure.in

@@ -82,6 +82,9 @@ void main(void) {
 if test "$ac_cv_working_getaddrinfo" = "yes"; then
   AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works])
   AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
+
+  IPV6_ENABLED=1
+  AC_SUBST(IPV6_ENABLED)
 fi
 ])
 
@@ -295,6 +298,14 @@ exit (rc != 0 ? 1 : 0); }],[
 	[ac_cv_gethostbyname_args=0])],
       [ac_cv_gethostbyname_args=0])])
 
+if test "$ac_cv_func_gethostbyname_r" = "yes"; then
+  if test "$ac_cv_gethostbyname_args" = "0"; then
+    dnl there's a gethostbyname_r() function, but we don't know how
+    dnl many arguments it wants!
+    AC_MSG_ERROR([couldn't figure out how to use gethostbyname_r()])
+  fi
+fi
+
 ])
 
 dnl **********************************************************************
@@ -498,6 +509,10 @@ then
       dnl add define KRB4
       AC_DEFINE(KRB4)
 
+      dnl substitute it too!
+      KRB4_ENABLED=1
+      AC_SUBST(KRB4_ENABLED)
+
       dnl the krb4 stuff needs a strlcpy()
       AC_CHECK_FUNCS(strlcpy)
 
@@ -564,14 +579,45 @@ else
 
 
     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)
+    AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \
+                     openssl/pem.h openssl/ssl.h openssl/err.h)
 
     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";
+    fi
+
+    AC_SUBST(OPENSSL_ENABLED)
+
   fi
 
+  if test X"$OPT_SSL" != Xoff &&
+     test "$OPENSSL_ENABLED" != "1"; then
+    AC_MSG_ERROR([OpenSSL libs and/or directories were not found where specified!])
+  fi
+
+
   dnl these can only exist if openssl exists
 
   AC_CHECK_FUNCS( RAND_status \
@@ -673,6 +719,7 @@ AC_CHECK_HEADERS( \
         winsock.h \
         time.h \
         io.h \
+        pwd.h
 )
 
 dnl Check for libz header
@@ -746,7 +793,9 @@ AC_CHECK_FUNCS( socket \
                 sigaction \
                 signal \
                 getpass_r \
-                strlcat
+                strlcat \
+                getpwuid \
+                geteuid
 )
 
 dnl removed 'getpass' check on October 26, 2000
@@ -786,5 +835,11 @@ AC_OUTPUT( Makefile \
 	   packages/Linux/Makefile \
 	   packages/Linux/RPM/Makefile \
 	   packages/Linux/RPM/curl.spec \
-	   packages/Linux/RPM/curl-ssl.spec )
+	   packages/Linux/RPM/curl-ssl.spec \
+           perl/Makefile \
+           perl/Curl_easy/Makefile \
+           php/Makefile \
+           php/examples/Makefile \
+           curl-config
+)
 

curl-config.in

@@ -0,0 +1,85 @@
+#! /bin/sh
+#
+# The idea to this kind of setup info script was stolen from numerous
+# other packages, such as neon, libxml and gnome.
+#
+# $Id$
+#
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+
+usage()
+{
+    cat <<EOF
+Usage: curl-config [OPTION]
+
+Available values for OPTION include:
+
+  --cflags    pre-processor and compiler flags
+  --feature   newline separated list of enabled features
+  --help      display this help and exit
+  --libs      library linking information
+  --prefix    curl install prefix
+  --version   output version information
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    # this deals with options in the style
+    # --option=value and extracts the value part
+    # [not currently used]
+    -*=*) value=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) value= ;;
+    esac
+
+    case "$1" in
+    --prefix)
+	echo $prefix
+	;;
+
+    --feature)
+	if test "@OPENSSL_ENABLED@" = "1"; then
+          echo "SSL"
+        fi
+	if test "@KRB4_ENABLED@" = "1"; then
+          echo "KRB4"
+        fi
+	if test "@IPV6_ENABLED@" = "1"; then
+          echo "IPv6"
+        fi
+	;;
+
+    --version)
+	echo libcurl @VERSION@
+	exit 0
+	;;
+
+    --help)
+	usage 0
+	;;
+
+    --cflags)
+       	echo @CPPFLAGS@
+       	;;
+
+    --libs)
+       	echo @LDFLAGS@ @LIBS@
+       	;;
+
+    *)
+	usage
+	exit 1
+	;;
+    esac
+    shift
+done
+
+exit 0

docs/CONTRIBUTE

@@ -16,7 +16,7 @@ The License Issue
  the same license curl and libcurl is already using unless stated otherwise.
 
  If you add a larger piece of code, you can opt to make that file or set of
- files to use a different license as long as they don't enfore any changes to
+ files to use a different license as long as they don't enforce any changes to
  the rest of the package and they make sense. Such "separate parts" can not be
  GPL (as we don't want the GPL virus to attack users of libcurl) but they must
  use "GPL compatible" licenses.

docs/FAQ

@@ -1,4 +1,4 @@
-Updated: March 13, 2001 (http://curl.haxx.se/docs/faq.shtml)
+Updated: April 22, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                   _   _ ____  _     
                               ___| | | |  _ \| |    
                              / __| | | | |_) | |    
@@ -12,6 +12,8 @@ FAQ
   1.2 What is libcurl?
   1.3 What is cURL not?
   1.4 When will you make curl do XXXX ?
+  1.5 Who makes cURL?
+  1.6 What do you get for making cURL?
 
  2. Install Related Problems
   2.1 configure doesn't find OpenSSL even when it is installed
@@ -30,7 +32,7 @@ FAQ
   3.6 Does curl support javascript, ASP, XML, XHTML or HTML version Y?
   3.7 Can I use curl to delete/rename a file through FTP?
   3.8 How do I tell curl to follow HTTP redirects?
-  3.9 How do I use curl in PHP?
+  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?
 
  4. Running Problems
@@ -45,7 +47,7 @@ FAQ
    4.5.4 "404 Not Found"
    4.5.5 "405 Method Not Allowed"
   4.6 Can you tell me what error code 142 means?
-  4.7 How do I keep usernames and passwords secret in Curl command lines?
+  4.7 How do I keep user names and passwords secret in Curl command lines?
   4.8 I found a bug!
   4.9 Curl can't authenticate to the server that requires NTLM?
 
@@ -55,7 +57,7 @@ FAQ
   5.3 How do I fetch multiple files with libcurl?
   5.4 Does libcurl do Winsock initing on win32 systems?
   5.5 Does CURLOPT_FILE and CURLOPT_INFILE work on win32 ?
-  5.6 What about Keep-Alive or persistant connections?
+  5.6 What about Keep-Alive or persistent connections?
 
  6. License Issues
   6.1 I have a GPL program, can I use the libcurl library?
@@ -76,17 +78,19 @@ FAQ
   with URL spelled in uppercase to make it obvious it deals with URLs. The
   fact it can also be pronounced 'see URL' also helped.
 
-  Curl supports a range of common internet protocols, currently including
+  Curl supports a range of common Internet protocols, currently including
   HTTP, HTTPS, FTP, GOPHER, LDAP, DICT, TELNET and FILE.
 
-  We spell it cURL or just curl.
+  We spell it cURL or just curl. We pronounce it with an initial k sound:
+  [kurl].
 
   1.2 What is libcurl?
 
-  libcurl is a reliable, higly portable multiprotocol file transfer library.
+  libcurl is a reliable and portable library which provides you with an easy
+  interface to a range of common Internet protocols.
 
-  Any application is free to use libcurl, even commercial or closed-source
-  ones.
+  You can use libcurl for free in your application even if it is commercial
+  or closed-source.
 
   1.3 What is cURL not?
   
@@ -99,8 +103,8 @@ FAQ
   something: fine, go ahead and write a script that wraps around curl to make
   it reality (like curlmirror.pl does).
 
-  Curl is not an ftp site mirroring program. Sure, get and send ftp with curl
-  but if you want systematic and sequential behaviour you should write a
+  Curl is not an FTP site mirroring program. Sure, get and send FTP with curl
+  but if you want systematic and sequential behavior you should write a
   script (or write a new program that interfaces libcurl) and do it.
 
   Curl is not a PHP tool, even though it works perfectly well when used from
@@ -140,6 +144,31 @@ FAQ
   * If you write the code, chances are bigger that it will get into curl
     faster.
 
+  1.5 Who makes cURL?
+
+  cURL and libcurl are not made by any single individual. Sure, Daniel
+  Stenberg writes the major parts, but various people's submissions are
+  important and crucial. Anyone can post their changes and improvements and
+  have them inserted in the main sources (of course on the condition that
+  developers agree on that the fixes are good).
+
+  The list of contributors in the bottom of the man page is only a small part
+  of all the people that every day provide us with bug reports, suggestions,
+  ideas and source code.
+
+  curl is developed by a community, with Daniel at the wheel.
+
+  1.6 What do you get for making cURL?
+
+  Project cURL is entirely free and open, without any commercial interests or
+  money involved. No person gets paid in any way for developing curl. We all
+  do this voluntarily on our spare time.
+
+  We get some help from companies. Contactor Data hosts the curl web site and
+  the main mailing list, Haxx owns the curl web site's domain and
+  sourceforge.net hosts several project tools we take advantage from like the
+  bug tracker, mailing lists and more.
+
 2. Install Related Problems
 
   2.1. configure doesn't find OpenSSL even when it is installed
@@ -175,7 +204,7 @@ FAQ
     a few functions are left out from the libssl.
 
     If the function names missing include RSA or RSAREF you can be certain
-    that this is because libssl requires the RSA and RSASEF libs to build.
+    that this is because libssl requires the RSA and RSAREF libs to build.
 
     See the INSTALL file section that explains how to add those libs to
     configure. Make sure that you remove the config.cache file before you
@@ -194,12 +223,12 @@ FAQ
 
   Curl uses OpenSSL to do the SSL stuff. The LIBEAY32.DLL is what curl needs
   on a windows machine to do https://. Check out the curl web site to find
-  accurate and up-to-date pointers to recent OpenSSL DDLs and other binary
+  accurate and up-to-date pointers to recent OpenSSL DLLs and other binary
   packages.
 
   2.4. Does cURL support Socks (RFC 1928) ?
 
-  No. Nobody has wanted it that badly yet. We appriciate patches that bring
+  No. Nobody has wanted it that badly yet. We appreciate patches that bring
   this functionality.
 
 
@@ -234,10 +263,11 @@ FAQ
   use the -F type. In all the most common cases, you should use -d which then
   causes a posting with the type 'application/x-www-form-urlencoded'.
 
-  This is described in some detail in the README.curl file, and if you don't
-  understand it the first time, read it again before you post questions about
-  this to the mailing list. Also, try reading through the mailing list
-  archives for old postings and questions regarding this.
+  This is described in some detail in the MANUAL and TheArtOfHttpScripting
+  documents, and if you don't understand it the first time, read it again
+  before you post questions about this to the mailing list. Also, try reading
+  through the mailing list archives for old postings and questions regarding
+  this.
 
   3.4. How do I tell curl to run custom FTP commands?
 
@@ -245,7 +275,7 @@ FAQ
   file transfer. Study the -Q/--quote option.
 
   Since curl is used for file transfers, you don't use curl to just perform
-  ftp commands without transfering anything. Therefore you must always specify
+  FTP commands without transferring anything. Therefore you must always specify
   a URL to transfer to/from even when doing custom FTP commands.
 
   3.5. How can I disable the Pragma: nocache header?
@@ -257,7 +287,7 @@ FAQ
   3.6. Does curl support javascript, ASP, XML, XHTML or HTML version Y?
 
   To curl, all contents are alike. It doesn't matter how the page was
-  generated. It may be ASP, PHP, perl, shell-script, SSI or plain
+  generated. It may be ASP, PHP, Perl, shell-script, SSI or plain
   HTML-files. There's no difference to curl and it doesn't even know what kind
   of language that generated the page.
 
@@ -267,7 +297,7 @@ FAQ
 
   3.7. Can I use curl to delete/rename a file through FTP?
 
-  Yes. You specify custom ftp commands with -Q/--quote.
+  Yes. You specify custom FTP commands with -Q/--quote.
 
   One example would be to delete a file after you have downloaded it:
 
@@ -281,8 +311,21 @@ FAQ
 
      curl -L http://redirector.com
 
-  3.9 How do I use curl in PHP?
+  3.9 How do I use curl in PHP, Perl, Tcl, Ruby or Java?
 
+  There exist many language-interfaces for curl that integrates it better with
+  various languages. If you are fluid in a script language, you may very well
+  opt to use such an interface instead of using the command line tool.
+
+  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!
+
+  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:
+
+        http://curl.haxx.se/libcurl/
+  
   PHP4 has the ability to use libcurl as an internal module if built with that
   option enabled. You then get a set of extra functions that can be used
   within your PHP programs. You find all details about those functions in the
@@ -297,7 +340,7 @@ FAQ
   3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
 
   Curl adheres to the HTTP spec, which basically means you can play with *any*
-  protocol that is built ontop of HTTP. Protocols such as SOAP, WEBDAV and
+  protocol that is built on top of HTTP. Protocols such as SOAP, WEBDAV and
   XML-RPC are all such ones. You can use -X to set custom requests and -H to
   set custom headers (or replace internally generated ones).
 
@@ -325,7 +368,7 @@ FAQ
 
   In general unix shells, the & letter is treated special and when used, it
   runs the specified command in the background. To safely send the & as a part
-  of a URL, you should qoute the entire URL by using single (') or double (")
+  of a URL, you should quote the entire URL by using single (') or double (")
   quotes around it.
 
   An example that would invoke a remote CGI that uses &-letters could be:
@@ -400,13 +443,13 @@ FAQ
   abort from such a condition and that's why it got this undocumented
   error. This should not occur in releases after 7.4.1.
 
-  4.7. How do I keep usernames and passwords secret in Curl command lines?
+  4.7. How do I keep user names and passwords secret in Curl command lines?
 
   This problem has two sides:
 
   The first part is to avoid having clear-text passwords in the command line
   so that they don't appear in 'ps' outputs and similar. That is easily
-  avoided by using the "-K" option tho tell curl to read parameters from a
+  avoided by using the "-K" option to tell curl to read parameters from a
   file or stdin to which you can pass the secret info.
 
   To keep the passwords in your account secret from the rest of the world is
@@ -416,11 +459,11 @@ FAQ
 
   Also note that regular HTTP and FTP passwords are sent in clear across the
   network. All it takes for anyone to fetch them is to listen on the network.
-  Evesdropping is very easy.
+  Eavesdropping is very easy.
 
   4.8 I found a bug!
 
-  It is not a bug if the behaviour is documented. Read the docs first.
+  It is not a bug if the behavior is documented. Read the docs first.
 
   If it is a problem with a binary you've downloaded or a package for your
   particular platform, try contacting the person who built the package/archive
@@ -449,14 +492,14 @@ FAQ
   programs. libcurl will use thread-safe functions instead of non-safe ones if
   your system has such.
 
-  We would appriciate some kind of report or README file from those who have
+  We would appreciate some kind of report or README file from those who have
   used libcurl in a threaded environment.
 
   5.2 How can I receive all data into a large memory chunk?
 
   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 receivied data to a file.
+  whatever you want. You do not have to write the received data to a file.
 
   One solution to this problem could be to have a pointer to a struct that you
   pass to the callback function. You set the pointer using the
@@ -492,13 +535,13 @@ FAQ
   curl_easy_setopt() and then transfer it with curl_easy_perform(). The handle
   you get from curl_easy_init() is not only reusable starting with libcurl
   7.7, but also you're encouraged to reuse it if you can, as that will enable
-  libcurl to use persistant connections.
+  libcurl to use persistent connections.
 
   For libcurl prior to 7.7, there was no multiple file support. The only
   available way to do multiple requests was to init/perform/cleanup for each
   transfer.
 
-  5.4 Does libcurl do Winsock initing on win32 systems?
+  5.4 Does libcurl do Winsock initialization on win32 systems?
 
   No.
 
@@ -518,15 +561,15 @@ FAQ
 
   (Provided by Joel DeYoung and Bob Schader)
 
-  5.6 What about Keep-Alive or persistant connections?
+  5.6 What about Keep-Alive or persistent connections?
 
   Starting with version 7.7, curl and libcurl will have excellent support for
-  persistant connections when transferring several files from the same server.
+  persistent connections when transferring several files from the same server.
   Curl will attempt to reuse connections for all URLs specified on the same
   command line/config file, and libcurl will reuse connections for all
   transfers that are made using the same libcurl handle.
 
-  Previous versions had no persistant connection support.
+  Previous versions had no persistent connection support.
 
 6. License Issues
 

docs/INSTALL

@@ -7,24 +7,35 @@
                                 How To Compile
 
 Curl has been compiled and built on numerous different operating systems. The
-way to proceed is mainly divided in two different ways: the unix way or the
+way to proceed is mainly divided in two different ways: the unix way or the 
 windows way.
 
-If you're using Windows (95, 98, NT) or OS/2, you should continue reading from
-the Win32 or OS/2 headers further down. All other systems should be capable of
-being installed as described below.
+If you're using Windows (95/98/NT/ME/2000 or whatever) or OS/2, you should
+continue reading from the Win32 or OS/2 headers further down. All other
+systems should be capable of being installed as described below.
 
 UNIX
 ====
 
-   The configure script *always* tries to find a working SSL library unless
-   explicitly told not to.  If you have OpenSSL installed in the default
-   search path for your compiler/linker, you don't need to do anything
-   special:
+   A normal unix installation is made in three or four steps (after you've
+   unpacked the source archive):
 
         ./configure
+        make
+        make test (optional)
+        make install
 
-   If you have OpenSSL installed in /usr/local/ssl, you can run configure
+   You probably need to be root when doing the last command.
+
+   If you want to install curl in a different file hierarchy than /usr/local,
+   you need to specify that already when running configure:
+
+        ./configure --prefix=/path/to/curl/tree
+
+   The configure script always tries to find a working SSL library unless
+   explicitly told not to. If you have OpenSSL installed in the default search
+   path for your compiler/linker, you don't need to do anything special. If
+   you have OpenSSL installed in e.g /usr/local/ssl, you can run configure
    like:
 
 	./configure --with-ssl
@@ -54,33 +65,11 @@ UNIX
        env CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" \
        ./configure
 
-   If your SSL library was compiled with rsaref (usually for use in
-   the United States), you may also need to set:
+   If your SSL library was compiled with rsaref (usually for use in the United
+   States), you may also need to set:
 
      LIBS=-lRSAglue -lrsaref
-     (from Doug Kaufman <dkaufman@rahul.net>)
-
-   Without SSL support, just run:
-
-     ./configure
-
-   Then run:
-
-     make
-
-   Use the executable `curl` in src/ directory.
-
-   To install curl on your system, run
-
-     make install
-
-   This will copy curl to /usr/local/bin/ (or $prefix/bin if you used the
-   --prefix option to configure) and it copies the man pages, the lib and the
-   include files to suitable places.
-
-   To make sure everything runs as supposed, run the test suite:
-
-     make test
+     (as suggested by Doug Kaufman)
 
    KNOWN PROBLEMS
 
@@ -109,7 +98,7 @@ UNIX
      they're executable and set to appear in the path *BEFORE* the actual (but
      obsolete) autoconf and autoheader scripts.
 
-   OPTIONS
+   MORE OPTIONS
 
      Remember, to force configure to use the standard cc compiler if both
      cc and gcc are present, run configure like
@@ -156,29 +145,27 @@ Win32
       MingW32 (GCC-2.95) style
       ------------------------
         Run the 'mingw32.bat' file to get the proper environment variables
-        set, then run 'make -f Makefile.m32' in the lib/ dir and then
-        'make -f Makefile.m32' in the src/ dir.
+        set, then run 'make mingw32' in the root dir.
 
-        If you have any problems linking libraries or finding header files,
-        be sure to look at the provided "Makefile.m32" files for the proper
+        If you have any problems linking libraries or finding header files, be
+        sure to verify that the provided "Makefile.m32" files use the proper
         paths, and adjust as necessary.
 
       Cygwin style
       ------------
-        Almost identical to the unix installation. Run the configure script
-        in the curl root with 'sh configure'. Make sure you have the sh
-        executable in /bin/ or you'll see the configure fail towards the
-        end.
+        Almost identical to the unix installation. Run the configure script in
+        the curl root with 'sh configure'. Make sure you have the sh
+        executable in /bin/ or you'll see the configure fail towards the end.
 
         Run 'make'
 
       Microsoft command line style
       ----------------------------
         Run the 'vcvars32.bat' file to get the proper environment variables
-        set, then run 'nmake -f Makefile.vc6' in the lib/ dir and then
-        'nmake -f Makefile.vc6' in the src/ dir.
+        set, then run 'nmake vc' in the root dir.
 
-        The vcvars32.bat file is part of the Microsoft development environment.
+        The vcvars32.bat file is part of the Microsoft development
+        environment.
 
       IDE-style
       -------------------------
@@ -196,9 +183,9 @@ Win32
         For VC++ 6, there's an included Makefile.vc6 that should be possible
         to use out-of-the-box.
 
-        Microsoft note: add /Zm200 to the compiler options, as the hugehelp.c
-        won't compile otherwise due to "too long puts string" or something
-        like that!
+        Microsoft note: add /Zm200 to the compiler options to increase the 
+		compiler's memory allocation limit, as the hugehelp.c won't compile
+		due to "too long puts string".
 
 
    With SSL:
@@ -206,26 +193,24 @@ Win32
       MingW32 (GCC-2.95) style
       ------------------------
         Run the 'mingw32.bat' file to get the proper environment variables
-        set, then run 'make -f Makefile.m32 SSL=1' in the lib/ dir and then
-        'make -f Makefile.m32 SSL=1' in the src/ dir.
+        set, then run 'make mingw32-ssl' in the root dir.
 
-        If you have any problems linking libraries or finding header files,
-        be sure to look at the provided "Makefile.m32" files for the proper
+        If you have any problems linking libraries or finding header files, be
+        sure to look at the provided "Makefile.m32" files for the proper
         paths, and adjust as necessary.
 
       Cygwin style
       ------------
-
         Haven't done, nor got any reports on how to do. It should although be
         identical to the unix setup for the same purpose. See above.
 
       Microsoft command line style
       ----------------------------
         Run the 'vcvars32.bat' file to get the proper environment variables
-        set, then run 'nmake -f Makefile.vc6 release-ssl' in the lib/ dir and
-        then 'nmake -f Makefile.vc6' in the src/ dir.
+        set, then run 'nmake vc-ssl' in the root dir.
 
-        The vcvars32.bat file is part of the Microsoft development environment.
+        The vcvars32.bat file is part of the Microsoft development
+        environment.
 
       Microsoft / Borland style
       -------------------------
@@ -266,10 +251,10 @@ IBM OS/2
 
 PORTS
 =====
-   Just to show off, this is a probably incomplete list of known hardware and
+   This is a probably incomplete list of known hardware and
    operating systems that curl has been compiled for:
 
-        - Ultrix
+        - Ultrix 4.3a
         - SINIX-Z v5
         - Alpha DEC OSF 4
         - Alpha Digital UNIX v3.2

docs/INTERNALS

@@ -201,10 +201,10 @@ Library
  exists in lib/getpass.c. libcurl offers a custom callback that can be used
  instead of this, but it doesn't change much to us.
 
-Persistant Connections
+Persistent Connections
 ======================
 
- With curl 7.7, we added persistant connection support to libcurl which has
+ With curl 7.7, we added persistent connection support to libcurl which has
  introduced a somewhat different treatmeant of things inside of libcurl.
 
  o The 'UrlData' struct returned in the curl_easy_init() call must never
@@ -227,7 +227,7 @@ Persistant Connections
  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
- persistant connections to work.
+ persistent connections to work.
 
 Library Symbols
 ===============

docs/LIBCURL

@@ -6,8 +6,8 @@
 
                    How To Use Libcurl In Your C/C++ Program
 
- [ libcurl can be used directly from within your PHP or Perl programs as well,
-   look elsewhere for documentation on this ]
+ [ libcurl can be used directly from within your Java, PHP, Perl, Ruby or Tcl
+   programs as well, look elsewhere for documentation on this ]
 
  The interface is meant to be very simple for applictions/programmers, hence
  the name "easy". We have therefore minimized the number of entries.
@@ -49,6 +49,29 @@ The Easy Interface
 
  For details on these, read the separate man pages.
 
+Linking with libcurl
+
+ Staring with 7.7.2 (on unix-like machines), there's a tool named curl-config
+ that gets installed with the rest of the curl stuff when 'make install' is
+ performed.
+
+ curl-config is added to make it easier for applications to link with
+ libcurl and developers to learn about libcurl and how to use it.
+
+ Run 'curl-config --libs' to get the (additional) linker options you need to
+ link with the particular version of libcurl you've installed.
+
+ For details, see the curl-config.1 man page.
+
+libcurl symbol names
+
+ All public functions in the libcurl interface are prefixed with 'curl_' (with
+ a lowercase c). You can find other functions in the library source code, but
+ other prefixes indicate the functions are private and may change without
+ further notice in the next release.
+
+ Only use documented functions and functionality!
+
 Portability
 
  libcurl works *exactly* the same, on any of the platforms it compiles and

docs/MANUAL

@@ -15,10 +15,6 @@ SIMPLE USAGE
 
         curl ftp://ftp.funet.fi/README
 
-  Get a gopher document from funet's gopher server:
-
-        curl gopher://gopher.funet.fi
-
   Get a web page from a server using port 8000:
 
         curl http://www.weirdserver.com:8000/
@@ -27,6 +23,10 @@ SIMPLE USAGE
 
         curl ftp://cool.haxx.se/
 
+  Get a gopher document from funet's gopher server:
+
+        curl gopher://gopher.funet.fi
+
   Get the definition of curl from a dictionary:
 
         curl dict://dict.org/m:curl
@@ -186,7 +186,7 @@ DETAILED INFORMATION
   -D/--dump-header option when getting files from both FTP and HTTP, and it
   will then store the headers in the specified file.
 
-  Store the HTTP headers in a separate file:
+  Store the HTTP headers in a separate file (headers.txt in the example):
 
         curl --dump-header headers.txt curl.haxx.se
 
@@ -245,32 +245,32 @@ POST (HTTP)
 
   -F accepts parameters like -F "name=contents". If you want the contents to
   be read from a file, use <@filename> as contents. When specifying a file,
-  you can also specify which content type the file is, by appending
-  ';type=<mime type>' to the file name. You can also post contents of several
-  files in one field. So that the field name 'coolfiles' can be sent three
-  files with different content types in a manner similar to:
+  you can also specify the file content type by appending ';type=<mime type>'
+  to the file name. You can also post the contents of several files in one field.
+  For example, the field name 'coolfiles' is used to send three  files, with
+  different content types using the following syntax:
 
         curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
         http://www.post.com/postit.cgi
 
-  If content-type is not specified, curl will try to guess from the extension
-  (it only knows a few), or use the previously specified type (from an earlier
-  file if several files are specified in a list) or finally using the default
-  type 'text/plain'.
+  If the content-type is not specified, curl will try to guess from the file
+  extension  (it only knows a few), or use the previously specified type
+  (from an earlier file if several files are specified in a list) or else it
+  will  using the default type 'text/plain'.
 
   Emulate a fill-in form with -F. Let's say you fill in three fields in a
   form. One field is a file name which to post, one field is your name and one
   field is a file description. We want to post the file we have written named
   "cooltext.txt". To let curl do the posting of this data instead of your
-  favourite browser, you have to check out the HTML of the form page to get to
-  know the names of the input fields. In our example, the input field names are
+  favourite browser, you have to read the HTML source of the form page and find
+  the names of the input fields. In our example, the input field names are
   'file', 'yourname' and 'filedescription'.
 
         curl -F "file=@cooltext.txt" -F "yourname=Daniel" \
              -F "filedescription=Cool text file with cool text inside" \
              http://www.post.com/postit.cgi
 
-  So, to send two files in one post you can do it in two ways:
+  To send two files in one post you can do it in two ways:
 
   1. Send multiple files in a single "field" with a single field name:
  
@@ -280,11 +280,11 @@ POST (HTTP)
 
         curl -F "docpicture=@dog.gif" -F "catpicture=@cat.gif" 
 
-REFERER
+REFERRER
 
   A HTTP request has the option to include information about which address
-  that referred to actual page, and curl allows the user to specify that
-  referrer to get specified on the command line. It is especially useful to
+  that referred to actual page.  Curl allows you to specify the
+  referrer to be used on the command line. It is especially useful to
   fool or trick stupid servers or CGI scripts that rely on that information
   being available or contain certain data.
 
@@ -353,13 +353,17 @@ COOKIES
   Note that by specifying -b you enable the "cookie awareness" and with -L
   you can make curl follow a location: (which often is used in combination
   with cookies). So that if a site sends cookies and a location, you can
-  use a non-existing file to trig the cookie awareness like:
+  use a non-existing file to trigger the cookie awareness like:
 
-        curl -L -b empty-file www.example.com
+        curl -L -b empty.txt www.example.com
 
   The file to read cookies from must be formatted using plain HTTP headers OR
   as netscape's cookie file. Curl will determine what kind it is based on the
-  file contents.
+  file contents.  In the above command, curl will parse the header and store
+  the cookies received from www.example.com.  curl will send to the server the
+  stored cookies which match the request as it follows the location.  The
+  file "empty.txt" may be a non-existant file.
+  
 
 PROGRESS METER
 
@@ -392,12 +396,12 @@ PROGRESS METER
 
 SPEED LIMIT
 
-  Curl offers the user to set conditions regarding transfer speed that must
-  be met to let the transfer keep going. By using the switch -y and -Y you
-  can make curl abort transfers if the transfer speed doesn't exceed your
-  given lowest limit for a specified time.
+  Curl allows the user to set the transfer speed conditions that must be met
+  to let the transfer keep going. By using the switch -y and -Y you
+  can make curl abort transfers if the transfer speed is below the specified
+  lowest limit for a specified time.
 
-  To let curl abandon downloading this page if its slower than 3000 bytes per
+  To have curl abort the download if the speed is slower than 3000 bytes per
   second for 1 minute, run:
 
         curl -y 3000 -Y 60 www.far-away-site.com
@@ -610,7 +614,7 @@ RESUMING FILE TRANSFERS
  (*1) = This requires that the ftp server supports the non-standard command
         SIZE. If it doesn't, curl will say so.
 
- (*2) = This requires that the wb server supports at least HTTP/1.1. If it
+ (*2) = This requires that the web server supports at least HTTP/1.1. If it
         doesn't, curl will say so.
 
 TIME CONDITIONS

docs/Makefile.am

@@ -6,6 +6,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 man_MANS = \
 	curl.1 \
+	curl-config.1 \
 	curl_easy_cleanup.3 \
 	curl_easy_getinfo.3 \
 	curl_easy_init.3 \
@@ -17,7 +18,13 @@ man_MANS = \
 	curl_getenv.3 \
 	curl_slist_append.3 \
 	curl_slist_free_all.3 \
-	curl_version.3
+	curl_version.3 \
+	curl_escape.3 \
+	curl_unescape.3 \
+	curl_strequal.3 \
+	curl_strnequal.3 \
+	curl_printf.3 \
+	libcurl.5
 
 EXTRA_DIST = $(man_MANS) \
 	MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS \

docs/TODO

@@ -9,21 +9,22 @@ 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 7.7 release:
+To do for the next release:
 
- * Add a special connection-timeout that only goes for the connection phase.
-
-To do for the 7.8 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.
 
  * Make SSL session ids get used if multiple HTTPS documents from the same
    host is requested.
 
 To do in a future release (random order):
 
- * Document the undocumented libcurl functions: the printf clones (like
-   curl_msprintf, curl_mfprintf, curl_msnprintf, curl_maprintf and
-   curl_mvfprintf), the string compare functions (curl_strequal
-   and curl_strnequal) and the URL escape/unescape functions.
+ * 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
+   too many separate files. We also need to have the test suite support
+   different behaviors, like when libcurl is compiled for IPv6 support and
+   thus performs a different set of FTP commands.
 
  * Add configure options that disables certain protocols in libcurl to
    decrease footprint.  '--disable-[protocol]' where protocol is http, ftp,
@@ -37,9 +38,10 @@ To do in a future release (random order):
    stamp as the remote file. libcurl already is capable of fetching the remote
    file's date.
 
- * Make the SSL layer option capable of using the Mozilla Security Services as
-   an alternative to OpenSSL:
-   http://www.mozilla.org/projects/security/pki/nss/
+ * Make curl's SSL layer option capable of using other free SSL libraries.
+   Such as the Mozilla Security Services
+   (http://www.mozilla.org/projects/security/pki/nss/) and GNUTLS
+   (http://gnutls.hellug.gr/)
 
  * Add asynchronous name resolving, as this enables full timeout support for
    fork() systems.
@@ -88,5 +90,3 @@ To do in a future release (random order):
    EPRT for IPv6 (done), and EPSV instead of PASV.  HTTP proxies are left to
    add support for.
 
- * SSL for more protocols, like SSL-FTP...
-   (http://search.ietf.org/internet-drafts/draft-murray-auth-ftp-ssl-05.txt)

docs/curl-config.1

@@ -0,0 +1,54 @@
+.\" You can view this file with:
+.\" nroff -man curl-config.1
+.\" Written by Daniel Stenberg
+.\"
+.TH curl-config 1 "18 March 2001" "Curl 7.7.2" "curl-config manual"
+.SH NAME
+curl-config \- Get information about a libcurl installation
+.SH SYNOPSIS
+.B curl-config [options]
+.SH DESCRIPTION
+.B curl-config
+displays information about a previous curl and libcurl installation.
+.SH OPTIONS
+.IP "--cflags"
+What set of CFLAGS that was used when libcurl was built. This is mostly a
+debug option that serves no particular use to most people.
+.IP "--feature"
+Lists what particular main features the installed libcurl was built with. At
+the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume
+any particular order. The keywords will be separated by newlines. There may be
+none, one or several keywords in the list.
+.IP "--help"
+Displays the available options.
+.IP "--libs"
+Shows the complete set of libs and other linker options you will need in order
+to link your application with libcurl.
+.IP "--prefix"
+This is the prefix used when libcurl was installed. Libcurl is then installed
+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.
+.SH "EXAMPLES"
+What is the path to the curl header files?
+
+  echo `curl-config --prefix`/include
+
+What is the path to libcurl?
+
+  echo `curl-config --prefix`/lib
+
+What other linker options do I need when I link with libcurl?
+
+  curl-config --libs
+
+How do I know if libcurl was built with SSL support?
+
+  curl-config --feature | grep SSL
+
+What's the installed libcurl version?
+
+  curl-config --version
+.SH "SEE ALSO"
+.BR curl (1)

docs/curl.1

@@ -2,7 +2,7 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "12 March 2001" "Curl 7.7" "Curl Manual"
+.TH curl 1 "20 April 2001" "Curl 7.7.2" "Curl Manual"
 .SH NAME
 curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
 HTTPS syntax.
@@ -91,6 +91,15 @@ also be enforced by using an URL that ends with ";type=A". This option causes
 data sent to stdout to be in text mode for win32 systems.
 
 If this option is used twice, the second one will disable ASCII usage.
+.IP "--connect-timeout <seconds>"
+Maximum time in seconds that you allow the connection to the server to take.
+This only limits the connection phase, once curl has connected this option is
+of no more use. This option didn't work in win32 systems until 7.7.2.  See
+also the
+.I "--max-time"
+option.
+
+If this option is used several times, the last one will be used.
 .IP "-c/--continue"
 .B Deprecated. Use '-C -' instead.
 Continue/Resume a previous file transfer. This instructs curl to
@@ -109,17 +118,18 @@ If used with uploads, the ftp server command SIZE will not be used by
 curl. Upload resume is for FTP only.
 HTTP resume is only possible with HTTP/1.1 or later servers.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-d/--data <data>"
-(HTTP) Sends the specified data in a POST request to the HTTP server. Note
-that the data is sent exactly as specified with no extra processing (with all
-newlines cut off).  The data is expected to be "url-encoded". This will cause
-curl to pass the data to the server using the content-type
-application/x-www-form-urlencoded. Compare to -F. If more than one -d/--data
-option is used on the same command line, the data pieces specified will be
-merged together with a separating &-letter. Thus, using '-d name=daniel -d
-skill=lousy' would generate a post chunk that looks like
-'name=daniel&skill=lousy'.
+(HTTP) Sends the specified data in a POST request to the HTTP server, in a way
+that can emulate as if a user has filled in a HTML form and pressed the submit
+button. Note that the data is sent exactly as specified with no extra
+processing (with all newlines cut off).  The data is expected to be
+"url-encoded". This will cause curl to pass the data to the server using the
+content-type application/x-www-form-urlencoded. Compare to -F. If more than
+one -d/--data option is used on the same command line, the data pieces
+specified will be merged together with a separating &-letter. Thus, using '-d
+name=daniel -d skill=lousy' would generate a post chunk that looks like
+\&'name=daniel&skill=lousy'.
 
 If you start the data with the letter @, the rest should be a file name to
 read the data from, or - if you want curl to read the data from stdin.  The
@@ -130,12 +140,12 @@ To post data purely binary, you should instead use the --data-binary option.
 
 -d/--data is the same as --data-ascii.
 
-If this option is used serveral times, the ones following the first will
+If this option is used several times, the ones following the first will
 append data.
 .IP "--data-ascii <data>"
 (HTTP) This is an alias for the -d/--data option.
 
-If this option is used serveral times, the ones following the first will
+If this option is used several times, the ones following the first will
 append data.
 .IP "--data-binary <data>"
 (HTTP) This posts data in a similar manner as --data-ascii does, although when
@@ -143,9 +153,9 @@ using this option the entire context of the posted data is kept as-is. If you
 want to post a binary file without the strip-newlines feature of the
 --data-ascii option, this is for you.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 
-If this option is used serveral times, the ones following the first will
+If this option is used several times, the ones following the first will
 append data.
 .IP "-D/--dump-header <file>"
 (HTTP/FTP)
@@ -156,7 +166,7 @@ This option is handy to use when you want to store the cookies that a HTTP
 site sends to you. The cookies could then be read in a second curl invoke by
 using the -b/--cookie option!
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-e/--referer <URL>"
 (HTTP) Sends the "Referer Page" information to the HTTP server. This can also
 be set with the -H/--header flag of course.  When used with
@@ -165,7 +175,12 @@ you can append ";auto" to the referer URL to make curl automatically set the
 previous URL when it follows a Location: header. The ";auto" string can be
 used alone, even if you don't set an initial referer.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
+.IP "--egd-file <file>"
+(HTTPS) Specify the path name to the Entropy Gathering Daemon socket. The
+socket is used to seed the random engine for SSL connections. See also the
+.I "--random-file"
+option.
 .IP "-E/--cert <certificate[:password]>"
 (HTTPS)
 Tells curl to use the specified certificate file when getting a file
@@ -174,12 +189,12 @@ If the optional password isn't specified, it will be queried for on
 the terminal. Note that this certificate is the private key and the private
 certificate concatenated!
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "--cacert <CA certificate>"
 (HTTPS) Tells curl to use the specified certificate file to verify the
 peer. The certificate must be in PEM format.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-f/--fail"
 (HTTP)
 Fail silently (no output at all) on server errors. This is mostly done
@@ -201,7 +216,7 @@ get attached in the post as a file upload, while the < makes a text field and
 just get the contents for that text field from a file.
 
 Example, to send your password file to the server, where
-'password' is the name of the form-field to which /etc/passwd will be the
+\&'password' is the name of the form-field to which /etc/passwd will be the
 input:
 
 .B curl
@@ -242,7 +257,7 @@ name, IP address or host name. An example could look like:
 
 .B "curl --interface eth0:1 http://www.netscape.com/"
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-I/--head"
 (HTTP/FTP)
 Fetch the HTTP-header only! HTTP-servers feature the command HEAD
@@ -255,7 +270,7 @@ If this option is used twice, the second will again disable header only.
 should be one of 'clear', 'safe', 'confidential' or 'private'. Should you use
 a level that is not one of these, 'private' will instead be used.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-K/--config <config file>"
 Specify which config file to read curl arguments from. The config file is a
 text file in which command line arguments can be written which then will be
@@ -289,8 +304,11 @@ If this option is used twice, the second will again disable location following.
 Maximum time in seconds that you allow the whole operation to take.  This is
 useful for preventing your batch jobs from hanging for hours due to slow
 networks or links going down.  This doesn't work fully in win32 systems.
+See also the
+.I "--connect-timeout"
+option.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-M/--manual"
 Manual. Display the huge help text.
 .IP "-n/--netrc"
@@ -308,7 +326,7 @@ directory.
 A quick and very simple example of how to setup a
 .I .netrc
 to allow curl to ftp to the machine host.domain.com with user name
-'myself' and password 'secret' should look similar to:
+\&'myself' and password 'secret' should look similar to:
 
 .B "machine host.domain.com login myself password secret"
 
@@ -368,7 +386,7 @@ i.e "my.host.domain" to specify machine
 (any single-letter string) to make it pick the machine's default
 .RE
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-q"
 If used as the first parameter on the command line, the
 .I $HOME/.curlrc
@@ -383,6 +401,12 @@ to be run before and after the transfer. If the server returns failure for one
 of the commands, the entire operation will be aborted.
 
 This option can be used multiple times.
+.IP "--random-file <file>"
+(HTTPS) Specify the path name to file containing what will be considered as
+random data. The data is used to seed the random engine for SSL connections.
+See also the
+.I "--edg-file"
+option.
 .IP "-r/--range <range>"
 (HTTP/FTP)
 Retrieve a byte range (i.e a partial document) from a HTTP/1.1 or FTP
@@ -421,7 +445,7 @@ document.
 FTP range downloads only support the simple syntax 'start-stop' (optionally
 with one of the numbers omitted). It depends on the non-RFC command SIZE.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-s/--silent"
 Silent mode. Don't show progress meter or error messages.  Makes
 Curl mute.
@@ -448,18 +472,18 @@ think that your last directory name is the remote file name to
 use. That will most likely cause the upload operation to fail. If
 this is used on a http(s) server, the PUT command will be used.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-u/--user <user:password>"
 Specify user and password to use when fetching. See README.curl for detailed
 examples of how to use this. If no password is specified, curl will
 ask for it interactively.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-U/--proxy-user <user:password>"
 Specify user and password to use for Proxy authentication. If no
 password is specified, curl will ask for it interactively.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "--url <URL>"
 Specify a URL to fetch. This option is mostly handy when you wanna specify
 URL(s) in a config file.
@@ -542,12 +566,12 @@ The average download speed that curl measured for the complete download.
 The average upload speed that curl measured for the complete upload.
 .RE
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-x/--proxy <proxyhost[:port]>"
 Use specified proxy. If the port number is not specified, it is assumed at
 port 1080.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-X/--request <command>"
 (HTTP)
 Specifies a custom request to use when communicating with the HTTP server.
@@ -558,19 +582,19 @@ HTTP 1.1 specification for details and explanations.
 Specifies a custom FTP command to use instead of LIST when doing file lists
 with ftp.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-y/--speed-time <time>"
 If a download is slower than speed-limit bytes per second during a speed-time
 period, the download gets aborted. If speed-time is used, the default
 speed-limit will be 1 unless set with -y.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-Y/--speed-limit <speed>"
 If a download is slower than this given speed, in bytes per second, for
 speed-time seconds it gets aborted. speed-time is set with -Y and is 30 if
 not set.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-z/--time-cond <date expression>"
 (HTTP)
 Request to get a file that has been modified later than the given time and
@@ -586,7 +610,7 @@ Start the date expression with a dash (-) to make it request for a document
 that is older than the given date/time, default is a document that is newer
 than the specified date/time.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .IP "-3/--sslv3"
 (HTTPS)
 Forces curl to use SSL version 3 when negotiating with a remote SSL server.
@@ -607,7 +631,7 @@ Redirect all writes to stderr to the specified file instead. If the file name
 is a plain '-', it is instead written to stdout. This option has no point when
 you're using a shell with decent redirecting capabilities.
 
-If this option is used serveral times, the last one will be used.
+If this option is used several times, the last one will be used.
 .SH FILES
 .I ~/.curlrc
 .RS
@@ -798,6 +822,9 @@ If you do find bugs, mail them to curl-bug@haxx.se.
  - 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>
 
 .SH WWW
 http://curl.haxx.se

docs/curl_easy_setopt.3

@@ -2,13 +2,13 @@
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
-.TH curl_easy_setopt 3 "13 March 2001" "libcurl 7.7" "libcurl Manual"
+.TH curl_easy_setopt 3 "10 April 2001" "libcurl 7.7.2" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - Set curl easy-session options
 .SH SYNOPSIS
 .B #include <curl/curl.h>
 .sp
-.BI "CURLcode curl_easy_setopt(CURL *" handle ", CURLoption "option ", ...);
+.BI "CURLcode curl_easy_setopt(CURL *" handle ", CURLoption "option ", ...);"
 .ad
 .SH DESCRIPTION
 curl_easy_setopt() is called to tell libcurl how to behave in a number of
@@ -54,7 +54,7 @@ if you set the
 option.
 .TP
 .B CURLOPT_WRITEFUNCTION
-Function pointer that should use match the following prototype:
+Function pointer that should match the following prototype:
 .BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
 This function gets called by libcurl as soon as there is received data that
 needs to be written down. The size of the data pointed to by
@@ -78,7 +78,7 @@ if you set the
 option.
 .TP
 .B CURLOPT_READFUNCTION
-Function pointer that should use match the following prototype:
+Function pointer that should match the following prototype:
 .BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
 This function gets called by libcurl as soon as it needs to read data in order
 to send it to the peer. The data area pointed at by the pointer
@@ -274,7 +274,11 @@ curl_slist' structs properly filled in. Use
 .I curl_slist_append(3)
 to create the list and
 .I curl_slist_free_all(3)
-to clean up an entire list.
+to clean up an entire list. If you add a header that is otherwise generated
+and used by libcurl internally, your added one will be used instead. If you
+add a header with no contents as in 'Accept:', the internally used header will
+just get disabled. Thus, using this option you can add new headers, replace
+internal headers and remove internal headers.
 .TP
 .B CURLOPT_HTTPPOST
 Tells libcurl you want a multipart/formdata HTTP POST to be made and you
@@ -313,7 +317,34 @@ struct curl_slist structs properly filled in as described for
 .I "CURLOPT_QUOTE"
 .TP
 .B CURLOPT_WRITEHEADER
-Pass a FILE * to be used to write the header part of the received data to.
+Pass a FILE * to be used to write the header part of the received data to. The
+headers are guaranteed to be written one-by-one to this file handle and only
+complete lines are written. Parsing headers should be easy enough using
+this. See also the
+.I CURLOPT_HEADERFUNCTION
+option.
+.TP
+.B CURLOPT_HEADERFUNCTION
+Function pointer that should match the following prototype:
+.BI "size_t function( void *ptr, size_t size, size_t nmemb, FILE *stream);"
+This function gets called by libcurl as soon as there is received header data
+that needs to be written down. The function will be called once for each
+header with a complete header line in each invoke. The size of the data
+pointed to by
+.I ptr 
+is
+.I size
+multiplied with
+.I nmemb.
+The pointer named
+.I stream
+will be the one you passed to libcurl with the
+.I CURLOPT_WRITEHEADER
+option.
+Return the number of bytes actually written or return -1 to signal error to
+the library (it will cause it to abort the transfer with a
+.I CURLE_WRITE_ERROR
+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
@@ -353,7 +384,7 @@ name. (Added in libcurl 7.3)
 .B CURLOPT_KRB4LEVEL
 Pass a char * as parameter. Set the krb4 security level, this also enables
 krb4 awareness.  This is a string, 'clear', 'safe', 'confidential' or
-'private'.  If the string is set but doesn't match one of these, 'private'
+\&'private'.  If the string is set but doesn't match one of these, 'private'
 will be used. Set the string to NULL to disable kerberos4. The kerberos
 support only works for FTP. (Added in libcurl 7.3)
 .TP
@@ -467,9 +498,18 @@ Pass a char * to a zero terminated file name. The file will be used to read
 from to seed the random engine for SSL. The more random the specified file is,
 the more secure will the SSL connection become.
 .TP
-.B CURLOPT_FORBID_REUSE
+.B CURLOPT_EGDSOCKET
 Pass a char * to the zero terminated path name to the Entropy Gathering Daemon
 socket. It will be used to seed the random engine for SSL.
+.TP
+.B CURLOPT_CONNECTTIMEOUT
+Pass a long. It should contain the maximum time in seconds that you allow the
+connection to the server to take.  This only limits the connection phase, once
+it has connected, this option is of no more use. Set to zero to disable
+connection timeout (it will then only timeout on the system's internal
+timeouts). This option doesn't work in win32 systems.  See also the
+.I CURLOPT_TIMEOUT
+option.
 .PP
 .SH RETURN VALUE
 0 means the option was set properly, non-zero means an error as

docs/curl_escape.3

@@ -0,0 +1,28 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_escape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
+.SH NAME
+curl_escape - URL encodes the given string
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_escape( char *" url ", int "length " );"
+.ad
+.SH DESCRIPTION
+This function will convert the given input string to an URL encoded string and
+return that as a new allocated string. All input characters that are not a-z,
+A-Z or 0-9 will be converted to their "URL escaped" version. If a sequence of
+%NN (where NN is a two-digit hexadecimal number) is found in the string to
+encode, that 3-letter combination will be copied to the output unmodifed,
+assuming that it is an already encoded piece of data.
+
+If the 'length' argument is set to 0, curl_escape() will use strlen() on the
+input 'url' string to find out the size.
+
+You must free() the returned string when you're done with it.
+.SH RETURN VALUE
+A pointer to a zero terminated string or NULL if it failed.
+.SH "SEE ALSO"
+.I curl_unescape(), RFC 2396

docs/curl_formfree.3

@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
-.TH curl_formfree 3 "5 March 2001" "libcurl 7.5" "libcurl Manual"
+.TH curl_formfree 3 "6 April 2001" "libcurl 7.7.1" "libcurl Manual"
 .SH NAME
 curl_formfree - free a previously build multipart/formdata HTTP POST chain
 .SH SYNOPSIS
@@ -19,5 +19,7 @@ None
 .SH "SEE ALSO"
 .BR curl_formparse "(3) "
 .SH BUGS
-Surely there are some, you tell me!
+libcurl 7.7.1 and earlier versions does not allow a NULL pointer to be used as
+argument.
+
 

docs/curl_printf.3

@@ -0,0 +1,88 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_printf 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
+.SH NAME
+curl_maprintf, curl_mfprintf, curl_mprintf, curl_msnprintf, curl_msprintf
+curl_mvaprintf, curl_mvfprintf, curl_mvprintf, curl_mvsnprintf,
+curl_mvsprintf - formatted output conversion
+.SH SYNOPSIS
+.B #include <curl/mprintf.h>
+.sp
+.BI "int curl_mprintf(const char *" format ", ...);"
+.br
+.BI "int curl_mfprintf(FILE *" fd ", const char *" format ", ...);"
+.br
+.BI "int curl_msprintf(char *" buffer ", const char *" format ", ...);"
+.br
+.BI "int curl_msnprintf(char *" buffer ", size_t " maxlength ", const char *" format ", ...);"
+.br
+.BI "int curl_mvprintf(const char *" format ", va_list " args ");"
+.br
+.BI "int curl_mvfprintf(FILE *" fd ", const char *" format ", va_list " args ");"
+.br
+.BI "int curl_mvsprintf(char *" buffer ", const char *" format ", va_list " args ");"
+.br
+.BI "int curl_mvsnprintf(char *" buffer ", size_t " maxlength ", const char *" format ", va_list " args ");"
+.br
+.BI "char *curl_maprintf(const char *" format ", ...);"
+.br
+.BI "char *curl_mvaprintf(const char *" format ", va_list " args ");"
+.SH DESCRIPTION
+These are all functions that produces output according to a format string and
+given arguments. These are mostly clones of the well-known C-style functions
+and there will be no detailed explanation of all available formatting rules
+and usage here.
+
+See this table for notable exceptions.
+.RS
+.TP
+.B curl_mprintf()
+Normal printf() clone.
+.TP
+.B curl_mfprintf()
+Normal fprinf() clone.
+.TP
+.B curl_msprintf()
+Normal sprintf() clone.
+.TP
+.B curl_msnprintf()
+snprintf() clone. Many systems don't have this. It is just like \fBsprintf\fP
+but with an extra argument after the buffer that specifies the length of the
+target buffer.
+.TP
+.B curl_mvprintf()
+Normal vprintf() clone.
+.TP
+.B curl_mvfprintf()
+Normal vfprintf() clone.
+.TP
+.B curl_mvsprintf()
+Normal vsprintf() clone.
+.TP
+.B curl_mvsnprintf()
+vsnprintf() clone.  Many systems don't have this. It is just like
+\fBvsprintf\fP but with an extra argument after the buffer that specifies the
+length of the target buffer.
+.TP
+.B curl_maprintf()
+Like printf() but returns the output string as a malloc()ed string. The
+returned string must be free()ed by the receiver.
+.TP
+.B curl_mvaprintf()
+Like curl_maprintf() but takes a va_list pointer argument instead of a
+variable amount of arguments.
+.RE
+
+To easily use all these cloned functions instead of the normal ones, #define
+_MPRINTF_REPLACE before you include the <curl/mprintf.h> file. Then all the
+normal names like printf, fprintf, sprintf etc will use the curl-functions
+instead.
+.SH RETURN VALUE
+The \fBcurl_maprintf\fP and \fBcurl_mvaprintf\fP functions return a pointer to
+a newly allocated string, or NULL it it failed.
+
+All other functions return the number of character they actually outputed.
+.SH "SEE ALSO"
+.BR printf "(3), " sprintf "(3), " fprintf "(3), " vprintf "(3) "

docs/curl_strequal.3

@@ -0,0 +1,30 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_strequal 3 "20 April 2001" "libcurl 7.7.2" "libcurl Manual"
+.SH NAME
+curl_strequal, curl_strnequal - case insensitive string comparisons
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "int curl_strequal(char *" str1 ", char *" str2 ");"
+.sp
+.BI "int curl_strenqual(char *" str1 ", char *" str2 ", size_t " len ");"
+.SH DESCRIPTION
+The
+.B curl_strequal()
+function compares the two strings \fIstr1\fP and \fIstr2\fP, ignoring the case
+of the characters. It returns a non-zero (TRUE) integer if the strings are
+identical.
+.sp
+The \fBcurl_strnequal()\fP function is similar, except it only compares the
+first \fIlen\fP characters of \fIstr1\fP.
+.sp
+These functions are provided by libcurl to enable applications to compare
+strings in a truly portable manner. There are no standard portable case
+insensitive string comparison functions. These two works on all platforms.
+.SH RETURN VALUE
+A pointer to a zero terminated string.
+.SH "SEE ALSO"
+.BR strcmp "(3), " strcasecmp "(3)"

docs/curl_strnequal.3

@@ -0,0 +1 @@
+.so curl_strequal.3

docs/curl_unescape.3

@@ -0,0 +1,27 @@
+.\" You can view this file with:
+.\" nroff -man [file]
+.\" Written by daniel@haxx.se
+.\"
+.TH curl_unescape 3 "22 March 2001" "libcurl 7.7" "libcurl Manual"
+.SH NAME
+curl_unescape - URL decodes the given string
+.SH SYNOPSIS
+.B #include <curl/curl.h>
+.sp
+.BI "char *curl_unescape( char *" url ", int "length " );"
+.ad
+.SH DESCRIPTION
+This function will convert the given URL encoded input string to a "plain
+string" and return that as a new allocated string. All input characters that
+are URL encoded (%XX where XX is a two-digit hexadecimal number, or +) will be
+converted to their plain text versions (up to a ? letter, no letters to the
+right of a ? letter will be converted).
+
+If the 'length' argument is set to 0, curl_unescape() will use strlen() on the
+input 'url' string to find out the size.
+
+You must free() the returned string when you're done with it.
+.SH RETURN VALUE
+A pointer to a zero terminated string or NULL if it failed.
+.SH "SEE ALSO"
+.I curl_escape(), RFC 2396

docs/examples/Makefile.am

@@ -6,8 +6,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 EXTRA_DIST = 
 	README curlgtk.c sepheaders.c simple.c postit.c \
-	win32sockets.c persistant.c \
-	getpageinvar.php simpleget.php simplepost.php
+	win32sockets.c persistant.c ftpget.c Makefile.example
 
 all:
 	@echo "done"

docs/examples/Makefile.example

@@ -0,0 +1,41 @@
+#############################################################################
+#                                  _   _ ____  _     
+#  Project                     ___| | | |  _ \| |    
+#                             / __| | | | |_) | |    
+#                            | (__| |_| |  _ <| |___ 
+#                             \___|\___/|_| \_\_____|
+#
+# $Id$
+#
+
+# What to call the final executable
+TARGET = example
+
+# Which object files that the executable consists of
+OBJS= ftpget.o
+
+# What compiler to use
+CC = gcc
+
+# Compiler flags, -g for debug, -c to make an object file
+CFLAGS = -c -g
+
+# This should point to a directory that holds libcurl, if it isn't
+# in the system's standard lib dir
+# We also set a -L to include the directory where we have the openssl
+# libraries
+LDFLAGS = -L/home/dast/lib -L/usr/local/ssl/lib
+
+# We need -lcurl for the curl stuff
+# 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
+LIBS = -lcurl -lsocket -lnsl -lssl -lcrypto -dl
+
+# Link the target with all objects and libraries
+$(TARGET) : $(OBJS)
+	$(CC) $(LDFLAGS) $(LIBS) -o $(TARGET) $(OBJS)
+
+# Compile the source files into object files
+ftpget.o : ftpget.c
+	$(CC) $(CFLAGS) $<

docs/examples/README

@@ -7,5 +7,12 @@ advantage of libcurl.
 If you end up with other small but still useful example sources, please mail
 them for submission in future packages and on the web site.
 
-There are examples for different languages and environments. Browse around to
-find those that fit you.
+The Makefile.example is an example makefile that could be used to build these
+examples. Just edit the file according to your system and requirements first.
+
+Try the php/examples/ directory for PHP programming snippets!
+
+  *PLEASE* do not use the curl.haxx.se site as a test target for your libcurl
+  applications/experiments. Even if the examples in this directory use that
+  site as an example URL at some places, it doesn't mean that the URLs work or
+  that we expect you to actually torture our web site with your tests! Thanks.

docs/examples/ftpget.c

@@ -0,0 +1,44 @@
+/*****************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * $Id$
+ */
+
+#include <stdio.h>
+
+#include <curl/curl.h>
+#include <curl/types.h>
+#include <curl/easy.h>
+
+/* to make this work under windows, use the win32-functions from the
+   win32socket.c file as well */
+
+int main(int argc, char **argv)
+{
+  CURL *curl;
+  CURLcode res;
+  FILE *ftpfile;
+  
+  /* local file name to store the file as */
+  ftpfile = fopen("curl.tar.gz", "wb"); /* b is binary for win */
+
+  curl = curl_easy_init();
+  if(curl) {
+    /* Get curl 7.7 from sunet.se's FTP site: */
+    curl_easy_setopt(curl, CURLOPT_URL,
+                     "ftp://ftp.sunet.se/pub/www/utilities/curl/curl-7.7.tar.gz");
+    curl_easy_setopt(curl, CURLOPT_FILE, ftpfile);
+    res = curl_easy_perform(curl);
+
+    /* always cleanup */
+    curl_easy_cleanup(curl);
+  }
+
+  fclose(ftpfile); /* close the local file */
+
+  return 0;
+}

docs/libcurl.5

@@ -0,0 +1,124 @@
+.\" You can view this file with:
+.\" nroff -man libcurl.5
+.\" Written by Daniel Stenberg
+.\"
+.TH libcurl 5 "20 April 2001" "libcurl 7.7.2" "libcurl overview"
+.SH NAME
+libcurl \- client-side URL transfers
+.SH DESCRIPTION
+This is an overview on how to use libcurl in your c/c++ programs. There are
+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()
+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.
+
+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).
+
+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.
+
+There is also a series of other helpful functions to use. They are:
+
+.RS
+.TP 10
+.B curl_version()
+displays the libcurl version
+.TP
+.B curl_getdate()
+converts a date string to time_t
+.TP
+.B curl_getenv()
+portable environment variable reader
+.TP
+.B curl_easy_getinfo()
+get information about a performed transfer
+.TP
+.B curl_formparse()
+helps building a HTTP form POST
+.TP
+.B curl_formfree()
+free a list built with curl_formparse()
+.TP
+.B curl_slist_append()
+builds a linked list
+.TP
+.B curl_slist_free_all()
+frees a whole curl_slist
+.RE
+
+.SH "LINKING WITH LIBCURL"
+Starting with 7.7.2 (on unix-like machines), there's a tool named curl-config
+that gets installed with the rest of the curl stuff when 'make install' is
+performed.
+
+curl-config is added to make it easier for applications to link with libcurl
+and developers to learn about libcurl and how to use it.
+
+Run 'curl-config --libs' to get the (additional) linker options you need to
+link with the particular version of libcurl you've installed.
+
+For details, see the curl-config.1 man page.
+.SH "LIBCURL SYMBOL NAMES"
+All public functions in the libcurl interface are prefixed with 'curl_' (with
+a lowercase c). You can find other functions in the library source code, but
+other prefixes indicate the functions are private and may change without
+further notice in the next release.
+
+Only use documented functions and functionality!
+.SH "PORTABILITY"
+libcurl works
+.B exactly
+the same, on any of the platforms it compiles and builds on.
+
+There's only one caution, and that is the win32 platform that may(*) require
+you to init the winsock stuff before you use the libcurl functions. Details on
+this are noted on the curl_easy_init() man page.
+
+(*) = it appears as if users of the cygwin environment get this done
+automatically.
+.SH "THREADS"
+Never ever call curl-functions simultaneously using the same handle from
+several threads. libcurl is thread-safe and can be used in any number of
+threads, but you must use separate curl handles if you want to use libcurl in
+more than one thread simultaneously.
+.SH "PERSISTANT CONNECTIONS"
+With libcurl 7.7, persistant connections were added. Persistant connections
+means that libcurl can re-use the same connection for several transfers, if
+the conditions are right.
+
+libcurl will *always* attempt to use persistant connections. Whenever you use
+curl_easy_perform(), libcurl will attempt to use an existing connection to do
+the transfer, and if none exists it'll open a new one that will be subject
+for re-use on a possible following call to curl_easy_perform().
+
+To allow libcurl to take full advantage of persistant connections, you should
+do as many of your file transfers as possible using the same curl
+handle. When you call curl_easy_cleanup(), all the possibly open connections
+held by libcurl will be closed and forgotten.
+
+Note that the options set with curl_easy_setopt() will be used in on every
+repeat curl_easy_perform() call
+.SH "COMPATIBILITY WITH OLDER LIBCURLS"
+Repeated curl_easy_perform() calls on the same handle were not supported in
+pre-7.7 versions, and caused confusion and defined behaviour.
+

include/curl/curl.h

@@ -146,7 +146,8 @@ 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 */
+  
   CURL_LAST /* never use! */
 } CURLcode;
 
@@ -425,6 +426,15 @@ typedef enum {
   /* Set to the Entropy Gathering Daemon socket pathname */
   CINIT(EGDSOCKET, OBJECTPOINT, 77),
 
+  /* Time-out connect operations after this amount of seconds, if connects
+     are OK within this time, then fine... This only aborts the connect
+     phase. [Only works on unix-style/SIGALRM operating systems] */
+  CINIT(CONNECTTIMEOUT, LONG, 78),
+
+  /* Function that will be called to store headers (instead of fwrite). The
+   * parameters will use fwrite() syntax, make sure to follow them. */
+  CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
+
   CURLOPT_LASTENTRY /* the last unusued */
 } CURLoption;
 
@@ -470,9 +480,14 @@ char *curl_getenv(char *variable);
 /* Returns a static ascii string of the libcurl version. */
 char *curl_version(void);
 
+/* Escape and unescape URL encoding in strings. The functions return a new
+ * allocated string or NULL if an error occurred.  */
+char *curl_escape(char *string, int length);
+char *curl_unescape(char *string, int length);
+
 /* This is the version number */
-#define LIBCURL_VERSION "7.7-beta3"
-#define LIBCURL_VERSION_NUM 0x070700
+#define LIBCURL_VERSION "7.7.2"
+#define LIBCURL_VERSION_NUM 0x070702
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {

java/CurlGlue.java

@@ -0,0 +1,134 @@
+/**
+ * The curl class is a JNI wrapper for libcurl. Please bear with me, I'm no
+ * true java dude (yet). Improve what you think is bad and send me the
+ * updates!
+ * daniel@haxx.se
+ *
+ * This is meant as a raw, crude and low-level interface to libcurl. If you
+ * want fancy stuff, build upon this.
+ */
+
+public class CurlGlue
+{
+  // start of imported generated list, make a new list with
+  // define2java.pl on demand
+  public static final int CURLOPT_NOTHING  = 0;
+  public static final int CURLOPT_FILE  = 10001;
+  public static final int CURLOPT_URL  = 10002;
+  public static final int CURLOPT_PORT  = 3;
+  public static final int CURLOPT_PROXY  = 10004;
+  public static final int CURLOPT_USERPWD  = 10005;
+  public static final int CURLOPT_PROXYUSERPWD  = 10006;
+  public static final int CURLOPT_RANGE  = 10007;
+  public static final int CURLOPT_INFILE  = 10009;
+  public static final int CURLOPT_ERRORBUFFER  = 10010;
+  public static final int CURLOPT_WRITEFUNCTION  = 20011;
+  public static final int CURLOPT_READFUNCTION  = 20012;
+  public static final int CURLOPT_TIMEOUT  = 13;
+  public static final int CURLOPT_INFILESIZE  = 14;
+  public static final int CURLOPT_POSTFIELDS  = 10015;
+  public static final int CURLOPT_REFERER  = 10016;
+  public static final int CURLOPT_FTPPORT  = 10017;
+  public static final int CURLOPT_USERAGENT  = 10018;
+  public static final int CURLOPT_LOW_SPEED_LIMIT  = 19;
+  public static final int CURLOPT_LOW_SPEED_TIME  = 20;
+  public static final int CURLOPT_RESUME_FROM  = 21;
+  public static final int CURLOPT_COOKIE  = 10022;
+  public static final int CURLOPT_HTTPHEADER  = 10023;
+  public static final int CURLOPT_HTTPPOST  = 10024;
+  public static final int CURLOPT_SSLCERT  = 10025;
+  public static final int CURLOPT_SSLCERTPASSWD  = 10026;
+  public static final int CURLOPT_CRLF  = 27;
+  public static final int CURLOPT_QUOTE  = 10028;
+  public static final int CURLOPT_WRITEHEADER  = 10029;
+  public static final int CURLOPT_COOKIEFILE  = 10031;
+  public static final int CURLOPT_SSLVERSION  = 32;
+  public static final int CURLOPT_TIMECONDITION  = 33;
+  public static final int CURLOPT_TIMEVALUE  = 34;
+  public static final int CURLOPT_HTTPREQUEST  = 10035;
+  public static final int CURLOPT_CUSTOMREQUEST  = 10036;
+  public static final int CURLOPT_STDERR  = 10037;
+  public static final int CURLOPT_POSTQUOTE  = 10039;
+  public static final int CURLOPT_WRITEINFO  = 10040;
+  public static final int CURLOPT_VERBOSE  = 41;
+  public static final int CURLOPT_HEADER  = 42;
+  public static final int CURLOPT_NOPROGRESS  = 43;
+  public static final int CURLOPT_NOBODY  = 44;
+  public static final int CURLOPT_FAILONERROR  = 45;
+  public static final int CURLOPT_UPLOAD  = 46;
+  public static final int CURLOPT_POST  = 47;
+  public static final int CURLOPT_FTPLISTONLY  = 48;
+  public static final int CURLOPT_FTPAPPEND  = 50;
+  public static final int CURLOPT_NETRC  = 51;
+  public static final int CURLOPT_FOLLOWLOCATION  = 52;
+  public static final int CURLOPT_FTPASCII  = 53;
+  public static final int CURLOPT_TRANSFERTEXT  = 53;
+  public static final int CURLOPT_PUT  = 54;
+  public static final int CURLOPT_MUTE  = 55;
+  public static final int CURLOPT_PROGRESSFUNCTION  = 20056;
+  public static final int CURLOPT_PROGRESSDATA  = 10057;
+  public static final int CURLOPT_AUTOREFERER  = 58;
+  public static final int CURLOPT_PROXYPORT  = 59;
+  public static final int CURLOPT_POSTFIELDSIZE  = 60;
+  public static final int CURLOPT_HTTPPROXYTUNNEL  = 61;
+  public static final int CURLOPT_INTERFACE  = 10062;
+  public static final int CURLOPT_KRB4LEVEL  = 10063;
+  public static final int CURLOPT_SSL_VERIFYPEER  = 64;
+  public static final int CURLOPT_CAINFO  = 10065;
+  public static final int CURLOPT_PASSWDFUNCTION  = 20066;
+  public static final int CURLOPT_PASSWDDATA  = 10067;
+  public static final int CURLOPT_MAXREDIRS  = 68;
+  public static final int CURLOPT_FILETIME  = 10069;
+  public static final int CURLOPT_TELNETOPTIONS  = 10070;
+  public static final int CURLOPT_MAXCONNECTS  = 71;
+  public static final int CURLOPT_CLOSEPOLICY  = 72;
+  public static final int CURLOPT_CLOSEFUNCTION  = 20073;
+  public static final int CURLOPT_FRESH_CONNECT  = 74;
+  public static final int CURLOPT_FORBID_REUSE  = 75;
+  public static final int CURLOPT_RANDOM_FILE  = 10076;
+  public static final int CURLOPT_EGDSOCKET  = 10077;
+  public static final int CURLOPT_CONNECTTIMEOUT  = 78;
+  public static final int CURLOPT_HEADERFUNCTION  = 20079;
+  // end of generated list
+
+  public CurlGlue() {
+    javacurl_handle = jni_init();
+  }
+
+  public void finalize() {
+    jni_cleanup(javacurl_handle);
+  }
+
+  private int javacurl_handle;
+
+  /* constructor and destructor for the libcurl handle */
+  private native int jni_init();
+  private native void jni_cleanup(int javacurl_handle);
+  private native synchronized int jni_perform(int javacurl_handle);
+  
+    // Instead of varargs, we have different functions for each
+  // kind of type setopt() can take
+  private native int jni_setopt(int libcurl, int option, String value);
+  private native int jni_setopt(int libcurl, int option, int value);
+  private native int jni_setopt(int libcurl, int option, CurlWrite value);
+
+  public native int getinfo();
+  
+  public int perform() {
+    return jni_perform(javacurl_handle);
+  }
+  public int setopt(int option, int value) {
+    return jni_setopt(javacurl_handle, option, value);
+  }
+  public int setopt(int option, String value) {
+    return jni_setopt(javacurl_handle, option, value);
+  }
+  public int setopt(int option, CurlWrite value) {
+    return jni_setopt(javacurl_handle, option, value);
+  }
+
+  static {
+    System.loadLibrary("javacurl");
+  }
+  
+}

java/CurlWrite.java

@@ -0,0 +1,9 @@
+public interface CurlWrite
+{
+  /**
+   * handleString gets called by libcurl on each chunk of data
+   * we receive from the remote server
+   */
+  public int handleString(byte s[]);
+}
+

java/Makefile

@@ -0,0 +1,35 @@
+
+TARGET = libjavacurl.so
+
+OBJS = javacurl.o
+
+CC = gcc
+CFLAGS = -c
+CPPFLAGS = -I/usr/j2se/include -I/usr/local/include -I/usr/j2se/include/solaris
+
+# Linux might use -shared -Wl,-soname,libnative.so instead of -G
+LDFLAGS = -G -lcurl -ldl -L/usr/local/ssl/lib -lssl -lcrypto
+
+all: CurlGlue.h CurlGlue.class javacurl.o $(TARGET) test.class
+
+test:
+	java test
+
+javacurl.o: javacurl.c CurlGlue.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) $<
+
+CurlGlue.h: CurlGlue.java CurlGlue.class
+	javah CurlGlue
+	touch CurlGlue.h
+
+test.class: CurlGlue.class javacurl.o
+	javac test.java
+
+CurlGlue.class: CurlGlue.java
+	javac $<
+
+$(TARGET): $(OBJS)
+	$(CC) -o $(TARGET) $(LDFLAGS) $(OBJS)
+
+clean:
+	rm -f javacurl.o CurlGlue.h CurlGlue.class

java/README

@@ -0,0 +1,13 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+                                Java Interface
+
+ This is very much work in progress and it does not work.
+
+ The interface is not set yet, bring your suggestions!
+
+ Feel free to grab the source files in here and help out!

java/define2java.pl

@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+
+open(GCC, "gcc -E ../include/curl/curl.h|");
+
+while(<GCC>) {
+    if($_ =~ /(CURLOPT_(.*)) += (.*)/) {
+        $var= $1;
+        $expr = $3;
+        $f=$3;
+        if($expr =~ / *(\d+) *\+ *(\d+)/) {
+            $expr = $1+$2;
+        }
+
+        # nah, keep the CURL prefix to make them look like other
+        # languages' defines
+        # $var =~ s/^CURL//g;
+
+        print "  public static final int $var = $expr;\n";
+    }
+}
+
+close(GCC);

java/javacurl.c

@@ -0,0 +1,196 @@
+
+#include <curl/curl.h> /* libcurl header */
+#include "CurlGlue.h"  /* the JNI-generated glue header file */
+
+/*
+ * This is a private struct allocated for every 'CurlGlue' object.
+ */
+struct javacurl {
+  void *libcurl;
+  void *whatever;
+  struct writecallback {
+    jmethodID mid;
+    JNIEnv *java;
+    jclass cls; /* global reference */
+    jobject object;
+  } write;
+};
+
+JNIEXPORT jint JNICALL Java_CurlGlue_jni_1init(JNIEnv *java,
+                                               jobject myself)
+{
+  void *libhandle;
+  struct javacurl *jcurl=NULL;
+
+  libhandle = curl_easy_init();
+
+  if(libhandle) {
+    jcurl=(struct javacurl *)malloc(sizeof(struct javacurl));
+    if(jcurl) {
+      memset(jcurl, 0, sizeof(struct javacurl));
+      jcurl->libcurl = libhandle;
+
+    }
+    else {
+      curl_easy_cleanup(libhandle);
+      return (jint)0;
+    }
+  }
+
+  return (jint) jcurl; /* nasty typecast */
+}
+
+JNIEXPORT void JNICALL Java_CurlGlue_jni_1cleanup(JNIEnv *java,
+                                                  jobject myself,
+                                                  jint jcurl)
+{
+
+  struct javacurl *curl = (struct javacurl*)jcurl;
+
+  if(curl->write.cls) {
+    /* a global reference we must delete */
+    (*java)->DeleteGlobalRef(java, curl->write.cls);
+    (*java)->DeleteGlobalRef(java, curl->write.object);
+  }
+
+  curl_easy_cleanup(curl->libcurl); /* cleanup libcurl stuff */
+
+  free((void *)curl); /* free the struct too */
+}
+
+/*
+ * setopt() int + string
+ */
+JNIEXPORT jint JNICALL Java_CurlGlue_jni_1setopt__IILjava_lang_String_2
+  (JNIEnv *java, jobject myself, jint jcurl, jint option, jstring value)
+{
+  /* get the actual string C-style */
+  const char *str = (*java)->GetStringUTFChars(java, value, 0);
+
+  void *handle = (void *)((struct javacurl*)jcurl)->libcurl;
+
+  puts("setopt int + string");
+  
+  return (jint)curl_easy_setopt(handle, (CURLoption)option, str);
+
+}
+
+/*
+ * setopt() int + int 
+ */
+JNIEXPORT jint JNICALL Java_CurlGlue_jni_1setopt__III
+  (JNIEnv *java, jobject myself, jint jcurl, jint option, jint value)
+{
+  void *handle = (void *)((struct javacurl*)jcurl)->libcurl;
+  CURLoption opt = (CURLoption)option;
+
+  puts("setopt int + int");
+
+  switch(opt) {
+  case CURLOPT_FILE:
+    /* silently ignored, we don't need user-specified callback data when
+       we have an object, and besides the CURLOPT_FILE is not exported
+       to the java interface */
+    return 0;
+  }
+
+  return (jint)curl_easy_setopt(handle, (CURLoption)option, value);
+}
+
+static int javacurl_write_callback(void *ptr,
+                                   size_t size,
+                                   size_t nmemb,
+                                   FILE  *stream)
+{
+  struct javacurl *curl = (struct javacurl *)stream;
+  size_t realsize = size * nmemb;
+  JNIEnv *java = curl->write.java;
+  jbyteArray jb=NULL;
+  int ret=0;
+
+  fprintf(stderr, "%d bytes data received in callback:\n"
+          "ptr=%p, java=%p cls=%p\n",
+          realsize, curl, java, curl->write.cls);
+
+  jb=(*java)->NewByteArray(java, realsize);
+  (*java)->SetByteArrayRegion(java, jb, 0, 
+                              realsize, (jbyte *)ptr);
+
+  fprintf(stderr, "created byte-array\n");
+
+  ret = (*java)->CallIntMethod(java,
+                               curl->write.object,
+                               curl->write.mid,
+                               jb);
+
+  fprintf(stderr, "java-method returned %d\n", ret);
+
+  return realsize;
+}
+
+/*
+ * setopt() int + object
+ */
+
+JNIEXPORT jint JNICALL Java_CurlGlue_jni_1setopt__IILCurlWrite_2
+  (JNIEnv *java, jobject myself, jint jcurl, jint option, jobject object)
+{
+  jclass cls_local = (*java)->GetObjectClass(java, object);
+  jmethodID mid;
+  struct javacurl *curl = (struct javacurl *)jcurl;
+  jclass cls;
+  jobject obj_global;
+
+  switch(option) {
+  case CURLOPT_WRITEFUNCTION:
+    /* this makes a reference that'll be alive until we kill it! */
+    cls = (*java)->NewGlobalRef(java, cls_local);
+
+    printf("setopt int + object, option = %d cls= %p\n",
+           option, cls);
+
+    if(!cls) {
+      puts("couldn't make local reference global");
+      return 0;
+    }
+
+    /* this is the write callback */
+    mid = (*java)->GetMethodID(java, cls, "handleString", "([B)I");
+    if(!mid) {
+      puts("no callback method found");
+      return 0;
+    }
+
+    obj_global = (*java)->NewGlobalRef(java, object);
+
+    curl->write.mid = mid;
+    curl->write.cls = cls;
+    curl->write.object = obj_global;
+    /*curl->write.java = java; stored on perform */
+
+    fprintf(stderr, "setopt write callback and write file pointer %p, java = %p\n",
+            curl, java);
+
+    curl_easy_setopt(curl->libcurl, CURLOPT_WRITEFUNCTION,
+                     javacurl_write_callback);
+    curl_easy_setopt(curl->libcurl, CURLOPT_FILE,
+                     curl);
+
+    break;
+  }
+  return 0;
+}
+
+JNIEXPORT jint JNICALL Java_CurlGlue_getinfo
+  (JNIEnv *java, jobject value)
+{
+    return 0;
+}
+
+JNIEXPORT jint JNICALL Java_CurlGlue_jni_1perform
+  (JNIEnv *java, jobject myself, jint jcurl)
+{
+  struct javacurl *curl=(struct javacurl*)jcurl;
+  curl->write.java = java;
+  return (jint)curl_easy_perform(curl->libcurl);
+}

java/test.java

@@ -0,0 +1,27 @@
+import CurlGlue;
+import CurlWrite;
+
+class test implements CurlWrite {
+    public int handleString(byte s[])
+    {
+        /* output everything */
+        System.out.println("IIIIIIIIIII -------------- OOOOOOOOOOOOOOOOOOO");
+        try {
+          System.out.write(s);
+        }
+        catch (java.io.IOException moo) {
+          // nothing
+        }
+        return 0;
+    }
+
+    public static void main(String[] args)
+    {
+        CurlGlue cg = new CurlGlue();
+        test cw = new test();
+        cg.setopt(CurlGlue.CURLOPT_URL, "http://www.contactor.se/");
+        cg.setopt(CurlGlue.CURLOPT_WRITEFUNCTION, cw);
+        cg.perform();
+    }
+}
+

lib/Makefile.b32

@@ -14,7 +14,7 @@ RM	   = del
 LIB	   = tlib
 TOPDIR	   = ..
 CURNTDIR   = .
-CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro
+CXXFLAGS   = -5 -O2 -w-aus -w-ccc -w-csu -w-par -w-pia -w-rch -w-inl -w-ngu -w-pro -tWM
 DEFINES    = -DLIBCURL_BIGENDIAN=0 -DNDEBUG -DWIN32 -DCONSOLE -DMBCS
 INCDIRS    = -I$(CURNTDIR);$(TOPDIR)/include/
 
@@ -34,6 +34,7 @@ SOURCES	   = \
 	formdata.c \
 	ftp.c \
 	http.c \
+        http_chunks.c \
 	ldap.c \
 	dict.c \
 	telnet.c \
@@ -64,11 +65,11 @@ OBJECTS = $(SOURCES:.c=.obj)
 all:	$(LIBCURLLIB)
 
 clean:
-	$(RM) $(LIBCURLLIB)
-        $(RM) *.obj
+	-$(RM) $(LIBCURLLIB)
+        -$(RM) *.obj
 
 $(LIBCURLLIB):  $(LINKLIB) $(OBJECTS) Makefile.b32.resp
-	$(RM) $(LIBCURLLIB)
+	-$(RM) $(LIBCURLLIB)
 	$(LIB) $(LIBCURLLIB) @Makefile.b32.resp
 
 

lib/Makefile.b32.resp

@@ -5,6 +5,7 @@
 +formdata.obj &
 +ftp.obj &
 +http.obj &
++http_chunks.obj &
 +ldap.obj &
 +dict.obj &
 +telnet.obj &

lib/Makefile.vc6

@@ -5,10 +5,11 @@
 ##
 ## Comments to: Troy Engel <tengel@sonic.net>
 ## Updated by: Craig Davison <cd@securityfocus.com>
+## Updated by: SM <sm@technologist.com>
 
 PROGRAM_NAME = libcurl.lib
 PROGRAM_NAME_DEBUG = libcurld.lib
-OPENSSL_PATH = ../../openssl-0.9.6
+#OPENSSL_PATH = ../../openssl-0.9.6a
 
 ########################################################
 ## Nothing more to do below this line!
@@ -22,7 +23,7 @@ CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ
 LINKD = link.exe -lib /out:$(PROGRAM_NAME_DEBUG)
 
 ## SSL Release
-CCRS = cl.exe /MD /O2 /D "NDEBUG" /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/include" /I "$(OPENSSL_PATH)/include/openssl"
+CCRS = cl.exe /MD /O2 /D "NDEBUG" /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 LINKRS = link.exe -lib /out:$(PROGRAM_NAME) /LIBPATH:$(OPENSSL_PATH)/out32dll
 
 CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
@@ -38,6 +39,7 @@ RELEASE_OBJS= \
 	formdatar.obj \
 	ftpr.obj \
 	httpr.obj \
+	http_chunksr.obj \
 	ldapr.obj \
 	dictr.obj \
 	telnetr.obj \
@@ -68,6 +70,7 @@ DEBUG_OBJS= \
 	formdatad.obj \
 	ftpd.obj \
 	httpd.obj \
+	http_chunksd.obj \
 	ldapd.obj \
 	dictd.obj \
 	telnetd.obj \
@@ -98,6 +101,7 @@ RELEASE_SSL_OBJS= \
 	formdatars.obj \
 	ftprs.obj \
 	httprs.obj \
+	http_chunksrs.obj \
 	ldaprs.obj \
 	dictrs.obj \
 	telnetrs.obj \
@@ -128,6 +132,7 @@ LINK_OBJS= \
 	formdata.obj \
 	ftp.obj \
 	http.obj \
+	http_chunks.obj \
 	ldap.obj \
 	dict.obj \
 	telnet.obj \
@@ -176,6 +181,8 @@ ftpr.obj: ftp.c
 	$(CCR) $(CFLAGS) ftp.c
 httpr.obj: http.c
 	$(CCR) $(CFLAGS) http.c
+http_chunksr.obj: http_chunks.c
+	$(CCR) $(CFLAGS) http_chunks.c
 ldapr.obj: ldap.c
 	$(CCR) $(CFLAGS) ldap.c
 dictr.obj: dict.c
@@ -234,6 +241,8 @@ ftpd.obj: ftp.c
 	$(CCD) $(CFLAGS) ftp.c
 httpd.obj: http.c
 	$(CCD) $(CFLAGS) http.c
+http_chunksd.obj: http_chunks.c
+	$(CCD) $(CFLAGS) http_chunks.c
 ldapd.obj: ldap.c
 	$(CCD) $(CFLAGS) ldap.c
 dictd.obj: dict.c
@@ -292,7 +301,9 @@ formdatars.obj: formdata.c
 ftprs.obj: ftp.c
 	$(CCRS) $(CFLAGS) ftp.c
 httprs.obj: http.c
-	$(CCRS) $(CFLAGS) http.c
+	$(CCR) $(CFLAGS) http.c
+http_chunksrs.obj: http_chunks.c
+	$(CCRS) $(CFLAGS) http_chunks.c
 ldaprs.obj: ldap.c
 	$(CCRS) $(CFLAGS) ldap.c
 dictrs.obj: dict.c

lib/curllib.dsp

@@ -1,367 +1,368 @@
-# Microsoft Developer Studio Project File - Name="curllib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=curllib - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "curllib.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "curllib.mak" CFG="curllib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "curllib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "curllib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "curllib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\jdk1.3.0_01\include" /I "C:\jdk1.3.0_01\include\win32" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"Release/curl.dll"
-
-!ELSEIF  "$(CFG)" == "curllib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\jdk1.3.0_01\include" /I "C:\jdk1.3.0_01\include\win32" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/curl.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "curllib - Win32 Release"
-# Name "curllib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\base64.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cookie.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dllinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\easy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\easyswig.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\easyswig_wrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\escape.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\formdata.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ftp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getdate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getenv.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getpass.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\hostip.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\http.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\if2ip.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\krb4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\libcurl.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\memdebug.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\netrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\progress.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\security.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sendf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\speedcheck.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssluse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strequal.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\telnet.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\timeval.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\transfer.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\url.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\version.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\arpa_telnet.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\base64.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cookie.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\escape.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\file.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\formdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ftp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\getdate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\getenv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\getpass.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hostip.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\http.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\if2ip.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\inet_ntoa_r.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\krb4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ldap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\memdebug.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\netrc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\progress.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\security.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sendf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\speedcheck.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssluse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\strequal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\telnet.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\timeval.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\transfer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\url.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\urldata.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="curllib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=curllib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "curllib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "curllib.mak" CFG="curllib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "curllib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "curllib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "curllib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib wsock32.lib /nologo /dll /machine:I386 /out:"Release/curl.dll"
+
+!ELSEIF  "$(CFG)" == "curllib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CURLLIB_EXPORTS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/curl.dll" /pdbtype:sept
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "curllib - Win32 Release"
+# Name "curllib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\base64.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cookie.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dllinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\easy.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\escape.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\formdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\getdate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\getenv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\getinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\getpass.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\hostip.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\http.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_chunks.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\if2ip.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\krb4.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\libcurl.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\memdebug.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\netrc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\progress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\security.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sendf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\speedcheck.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssluse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strequal.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\telnet.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\timeval.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\transfer.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\url.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\arpa_telnet.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\base64.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cookie.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\dict.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\escape.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\formdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ftp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\getdate.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\getenv.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\getpass.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hostip.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http_chunks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\if2ip.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\inet_ntoa_r.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\krb4.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\memdebug.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\netrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\progress.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\security.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sendf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\setup.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\speedcheck.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ssluse.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\strequal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\telnet.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\timeval.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\transfer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\url.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\urldata.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

lib/curllib.dsw

@@ -1,29 +1,29 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "curllib"=".\curllib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "curllib"=".\curllib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

lib/dict.c

@@ -100,7 +100,7 @@ CURLcode Curl_dict(struct connectdata *conn)
   char *path = conn->path;
   long *bytecount = &conn->bytecount;
 
-  if(data->bits.user_passwd) {
+  if(conn->bits.user_passwd) {
     /* AUTH is missing */
   }
 

lib/escape.c

@@ -25,6 +25,7 @@
  * allocated string or NULL if an error occurred.  */
 
 #include "setup.h"
+#include <ctype.h>
 #include <curl/curl.h>
 
 #include <stdio.h>
@@ -36,74 +37,89 @@
 #include "memdebug.h"
 #endif
 
-char *curl_escape(char *string)
+char *curl_escape(char *string, int length)
 {
-   int alloc=strlen(string)+1;
-   char *ns = malloc(alloc);
-   unsigned char in;
-   int newlen = alloc;
-   int index=0;
+  int alloc = (length?length:strlen(string))+1;  
+  char *ns = malloc(alloc);
+  unsigned char in;
+  int newlen = alloc;
+  int index=0;
 
-   while(*string) {
-      in = *string;
-      if(' ' == in)
-	 ns[index++] = '+';
-      else if(!(in >= 'a' && in <= 'z') &&
-	      !(in >= 'A' && in <= 'Z') &&
-	      !(in >= '0' && in <= '9')) {
-	 /* encode it */
-	 newlen += 2; /* the size grows with two, since this'll become a %XX */
-	 if(newlen > alloc) {
-	    alloc *= 2;
-	    ns = realloc(ns, alloc);
-	    if(!ns)
-	       return NULL;
-	 }
-	 sprintf(&ns[index], "%%%02X", in);
-	 index+=3;
+  length = alloc-1;
+  while(length--) {
+    in = *string;
+    if(' ' == in)
+      ns[index++] = '+';
+    else if(!(in >= 'a' && in <= 'z') &&
+            !(in >= 'A' && in <= 'Z') &&
+            !(in >= '0' && in <= '9')) {
+      /* encode it */
+      if(('%' == in) &&
+         (length>=2) &&
+         isxdigit((int)string[1]) &&
+         isxdigit((int)string[2]) ) {
+        /*
+         * This is an already encoded letter, leave it!
+         */
+        memcpy(&ns[index], string, 3);
+        string+=2;
       }
       else {
-	 /* just copy this */
-	 ns[index++]=in;
+        /* encode this now */
+
+        newlen += 2; /* the size grows with two, since this'll become a %XX */
+        if(newlen > alloc) {
+          alloc *= 2;
+          ns = realloc(ns, alloc);
+          if(!ns)
+            return NULL;
+        }
+        sprintf(&ns[index], "%%%02X", in);
       }
-      string++;
-   }
-   ns[index]=0; /* terminate it */
-   return ns;
+      index+=3;
+    }
+    else {
+      /* just copy this */
+      ns[index++]=in;
+    }
+    string++;
+  }
+  ns[index]=0; /* terminate it */
+  return ns;
 }
 
 char *curl_unescape(char *string, int length)
 {
-   int alloc = (length?length:strlen(string))+1;
-   char *ns = malloc(alloc);
-   unsigned char in;
-   int index=0;
-   unsigned int hex;
-   char querypart=FALSE; /* everything to the right of a '?' letter is
-                            the "query part" where '+' should become ' '.
-                            RFC 2316, section 3.10 */
+  int alloc = (length?length:strlen(string))+1;
+  char *ns = malloc(alloc);
+  unsigned char in;
+  int index=0;
+  unsigned int hex;
+  char querypart=FALSE; /* everything to the right of a '?' letter is
+                           the "query part" where '+' should become ' '.
+                           RFC 2316, section 3.10 */
   
-   while(--alloc > 0) {
-      in = *string;
-      if(querypart && ('+' == in))
-         in = ' ';
-      else if(!querypart && ('?' == in)) {
-        /* we have "walked in" to the query part */
-        querypart=TRUE;
+  while(--alloc > 0) {
+    in = *string;
+    if(querypart && ('+' == in))
+      in = ' ';
+    else if(!querypart && ('?' == in)) {
+      /* we have "walked in" to the query part */
+      querypart=TRUE;
+    }
+    else if('%' == in) {
+      /* encoded part */
+      if(sscanf(string+1, "%02X", &hex)) {
+        in = hex;
+        string+=2;
+        alloc-=2;
       }
-      else if('%' == in) {
-        /* encoded part */
-        if(sscanf(string+1, "%02X", &hex)) {
-          in = hex;
-          string+=2;
-          alloc-=2;
-        }
-      }
-
-      ns[index++] = in;
-      string++;
-   }
-   ns[index]=0; /* terminate it */
-   return ns;
+    }
+    
+    ns[index++] = in;
+    string++;
+  }
+  ns[index]=0; /* terminate it */
+  return ns;
   
 }

lib/escape.h

@@ -26,7 +26,7 @@
 /* Escape and unescape URL encoding in strings. The functions return a new
  * allocated string or NULL if an error occurred.  */
 
-char *curl_escape(char *string);
+char *curl_escape(char *string, int length);
 char *curl_unescape(char *string, int length);
 
 #endif

lib/file.c

@@ -183,11 +183,11 @@ CURLcode Curl_file(struct connectdata *conn)
       return res;
 
     now = Curl_tvnow();
-    if(Curl_pgrsUpdate(data))
+    if(Curl_pgrsUpdate(conn))
       res = CURLE_ABORTED_BY_CALLBACK;
   }
   now = Curl_tvnow();
-  if(Curl_pgrsUpdate(data))
+  if(Curl_pgrsUpdate(conn))
     res = CURLE_ABORTED_BY_CALLBACK;
 
   close(fd);

lib/formdata.c

@@ -371,6 +371,7 @@ char *Curl_FormBoundary(void)
 void Curl_FormFree(struct FormData *form)
 {
   struct FormData *next;
+
   do {
     next=form->next;  /* the following form line */
     free(form->line); /* free the line */
@@ -383,6 +384,11 @@ void Curl_FormFree(struct FormData *form)
 void curl_formfree(struct HttpPost *form)
 {
   struct HttpPost *next;
+
+  if(!form)
+    /* no form to free, just get out of this */
+    return;
+
   do {
     next=form->next;  /* the following form line */
 

lib/ftp.c

@@ -77,6 +77,9 @@
 #include "krb4.h"
 #endif
 
+#include "strequal.h"
+#include "ssluse.h"
+
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
 
@@ -314,6 +317,14 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
       return result;
   }
 
+  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;
+  }
+
+
   /* The first thing we do is wait for the "220*" line: */
   nread = Curl_GetFTPResponse(conn->firstsocket, buf, conn, &ftpcode);
   if(nread < 0)
@@ -335,8 +346,6 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
        set a valid level */
     sec_request_prot(conn, data->krb4_level);
 
-    data->cmdchannel = fdopen(conn->firstsocket, "w");
-
     if(sec_login(conn) != 0)
       infof(data, "Logging in with password in cleartext!\n");
     else
@@ -549,13 +558,14 @@ CURLcode _ftp(struct connectdata *conn)
   char *buf = data->buffer; /* this is our buffer */
   /* for the ftp PORT mode */
   int portsock=-1;
-  struct sockaddr_in serv_addr;
-  char hostent_buf[8192];
 #if defined (HAVE_INET_NTOA_R)
   char ntoa_buf[64];
 #endif
 #ifdef ENABLE_IPV6
   struct addrinfo *ai;
+#else
+  struct sockaddr_in serv_addr;
+  char hostent_buf[8192];
 #endif
 
   struct curl_slist *qitem; /* QUOTE item */
@@ -715,20 +725,20 @@ CURLcode _ftp(struct connectdata *conn)
 #ifdef ENABLE_IPV6
     struct addrinfo hints, *res, *ai;
     struct sockaddr_storage ss;
-    int sslen;
+    socklen_t sslen;
     char hbuf[NI_MAXHOST];
-    char *localaddr;
+
     struct sockaddr *sa=(struct sockaddr *)&ss;
 #ifdef NI_WITHSCOPEID
     const int niflags = NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
 #else
     const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
 #endif
-    unsigned char *ap;
-    unsigned char *pp;
+    char *ap;
+    char *pp;
     int alen, plen;
     char portmsgbuf[4096], tmp[4096];
-    char *p;
+
     char *mode[] = { "EPRT", "LPRT", "PORT", NULL };
     char **modep;
 
@@ -761,13 +771,13 @@ CURLcode _ftp(struct connectdata *conn)
 	continue;
 
       if (bind(portsock, ai->ai_addr, ai->ai_addrlen) < 0) {
-	close(portsock);
+	sclose(portsock);
 	portsock = -1;
 	continue;
       }
 
       if (listen(portsock, 1) < 0) {
-	close(portsock);
+	sclose(portsock);
 	portsock = -1;
 	continue;
       }
@@ -878,7 +888,7 @@ again:;
     }
 
     if (!*modep) {
-      close(portsock);
+      sclose(portsock);
       freeaddrinfo(res);
       return CURLE_FTP_PORT_FAILED;
     }
@@ -1027,9 +1037,10 @@ again:;
       struct addrinfo *res;
 #else
       struct hostent *he;
-#endif
-      char *str=buf,*ip_addr;
       char *hostdataptr=NULL;
+      char *ip_addr;
+#endif
+      char *str=buf;
 
       /*
        * New 227-parser June 3rd 1999.
@@ -1261,7 +1272,7 @@ again:;
         CURLE_FTP_COULDNT_SET_BINARY;
     }
 
-    if(data->resume_from) {
+    if(conn->resume_from) {
       /* we're about to continue the uploading of a file */
       /* 1. get already existing file's size. We use the SIZE
          command for this which may not exist in the server!
@@ -1275,7 +1286,7 @@ again:;
       /* 4. lower the infilesize counter */
       /* => transfer as usual */
 
-      if(data->resume_from < 0 ) {
+      if(conn->resume_from < 0 ) {
         /* we could've got a specified offset from the command line,
            but now we know we didn't */
 
@@ -1291,10 +1302,10 @@ again:;
         }
 
         /* get the size from the ascii string: */
-        data->resume_from = atoi(buf+4);
+        conn->resume_from = atoi(buf+4);
       }
 
-      if(data->resume_from) {
+      if(conn->resume_from) {
         /* do we still game? */
         int passed=0;
         /* enable append instead */
@@ -1304,7 +1315,7 @@ again:;
            input. If we knew it was a proper file we could've just
            fseek()ed but we only have a stream here */
         do {
-          int readthisamountnow = (data->resume_from - passed);
+          int readthisamountnow = (conn->resume_from - passed);
           int actuallyread;
 
           if(readthisamountnow > BUFSIZE)
@@ -1320,11 +1331,11 @@ again:;
             return CURLE_FTP_COULDNT_USE_REST;
           }
         }
-        while(passed != data->resume_from);
+        while(passed != conn->resume_from);
 
         /* now, decrease the size of the read */
         if(data->infilesize>0) {
-          data->infilesize -= data->resume_from;
+          data->infilesize -= conn->resume_from;
 
           if(data->infilesize <= 0) {
             failf(data, "File already completely uploaded\n");
@@ -1376,13 +1387,13 @@ again:;
     bool dirlist=FALSE;
     long downloadsize=-1;
 
-    if(data->bits.set_range && data->range) {
+    if(conn->bits.use_range && conn->range) {
       long from, to;
       int totalsize=-1;
       char *ptr;
       char *ptr2;
 
-      from=strtol(data->range, &ptr, 0);
+      from=strtol(conn->range, &ptr, 0);
       while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))
         ptr++;
       to=strtol(ptr, &ptr2, 0);
@@ -1392,22 +1403,23 @@ again:;
       }
       if((-1 == to) && (from>=0)) {
         /* X - */
-        data->resume_from = from;
+        conn->resume_from = from;
         infof(data, "FTP RANGE %d to end of file\n", from);
       }
       else if(from < 0) {
         /* -Y */
         totalsize = -from;
         conn->maxdownload = -from;
-        data->resume_from = from;
+        conn->resume_from = from;
         infof(data, "FTP RANGE the last %d bytes\n", totalsize);
       }
       else {
         /* X-Y */
         totalsize = to-from;
         conn->maxdownload = totalsize+1; /* include the last mentioned byte */
-        data->resume_from = from;
-        infof(data, "FTP RANGE from %d getting %d bytes\n", from, conn->maxdownload);
+        conn->resume_from = from;
+        infof(data, "FTP RANGE from %d getting %d bytes\n", from,
+              conn->maxdownload);
       }
       infof(data, "range-download from %d to %d, totally %d bytes\n",
             from, to, totalsize);
@@ -1455,7 +1467,7 @@ again:;
           CURLE_FTP_COULDNT_SET_BINARY;
       }
 
-      if(data->resume_from) {
+      if(conn->resume_from) {
 
         /* Daniel: (August 4, 1999)
          *
@@ -1480,34 +1492,39 @@ again:;
           int foundsize=atoi(buf+4);
           /* We got a file size report, so we check that there actually is a
              part of the file left to get, or else we go home.  */
-          if(data->resume_from< 0) {
+          if(conn->resume_from< 0) {
             /* We're supposed to download the last abs(from) bytes */
-            if(foundsize < -data->resume_from) {
+            if(foundsize < -conn->resume_from) {
               failf(data, "Offset (%d) was beyond file size (%d)",
-                    data->resume_from, foundsize);
+                    conn->resume_from, foundsize);
               return CURLE_FTP_BAD_DOWNLOAD_RESUME;
             }
             /* convert to size to download */
-            downloadsize = -data->resume_from;
+            downloadsize = -conn->resume_from;
             /* download from where? */
-            data->resume_from = foundsize - downloadsize;
+            conn->resume_from = foundsize - downloadsize;
           }
           else {
-            if(foundsize <= data->resume_from) {
+            if(foundsize < conn->resume_from) {
               failf(data, "Offset (%d) was beyond file size (%d)",
-                    data->resume_from, foundsize);
+                    conn->resume_from, foundsize);
               return CURLE_FTP_BAD_DOWNLOAD_RESUME;
             }
             /* Now store the number of bytes we are expected to download */
-            downloadsize = foundsize-data->resume_from;
+            downloadsize = foundsize-conn->resume_from;
           }
         }
 
+	if (downloadsize == 0) {
+	  failf(data, "File already complete");
+	  return CURLE_ALREADY_COMPLETE;
+	}
+	
         /* Set resume file transfer offset */
         infof(data, "Instructs server to resume from offset %d\n",
-              data->resume_from);
+              conn->resume_from);
 
-        ftpsendf(conn->firstsocket, conn, "REST %d", data->resume_from);
+        ftpsendf(conn->firstsocket, conn, "REST %d", conn->resume_from);
 
         nread = Curl_GetFTPResponse(conn->firstsocket, buf, conn, &ftpcode);
         if(nread < 0)
@@ -1698,16 +1715,9 @@ size_t Curl_ftpsendf(int fd, struct connectdata *conn, char *fmt, ...)
 
   strcat(s, "\r\n"); /* append a trailing CRLF */
 
-#ifdef KRB4
-  if(conn->sec_complete && conn->data->cmdchannel) {
-    bytes_written = sec_fprintf(conn, conn->data->cmdchannel, s);
-    fflush(conn->data->cmdchannel);
-  }
-  else
-#endif /* KRB4 */
-    {
-      bytes_written = swrite(fd, s, strlen(s));
-    }
+  bytes_written=0;
+  Curl_write(conn, fd, s, strlen(s), &bytes_written);
+
   return(bytes_written);
 }
 
@@ -1716,12 +1726,14 @@ CURLcode Curl_ftp_disconnect(struct connectdata *conn)
 {
   struct FTP *ftp= conn->proto.ftp;
 
-  if(ftp->user)
-    free(ftp->user);
-  if(ftp->passwd)
-    free(ftp->passwd);
-  if(ftp->entrypath)
-    free(ftp->entrypath);
-
+  /* The FTP session may or may not have been allocated/setup at this point! */
+  if(ftp) {
+    if(ftp->user)
+      free(ftp->user);
+    if(ftp->passwd)
+      free(ftp->passwd);
+    if(ftp->entrypath)
+      free(ftp->entrypath);
+  }
   return CURLE_OK;
 }

lib/getdate.c

@@ -104,6 +104,11 @@
 # include <string.h>
 #endif
 
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 # define __attribute__(x)
 #endif
@@ -127,44 +132,44 @@
    then those parser generators need to be fixed instead of adding those
    names to this list. */
 
-#define yymaxdepth gd_maxdepth
-#define yyparse gd_parse
-#define yylex   gd_lex
-#define yyerror gd_error
-#define yylval  gd_lval
-#define yychar  gd_char
-#define yydebug gd_debug
-#define yypact  gd_pact
-#define yyr1    gd_r1
-#define yyr2    gd_r2
-#define yydef   gd_def
-#define yychk   gd_chk
-#define yypgo   gd_pgo
-#define yyact   gd_act
-#define yyexca  gd_exca
-#define yyerrflag gd_errflag
-#define yynerrs gd_nerrs
-#define yyps    gd_ps
-#define yypv    gd_pv
-#define yys     gd_s
-#define yy_yys  gd_yys
-#define yystate gd_state
-#define yytmp   gd_tmp
-#define yyv     gd_v
-#define yy_yyv  gd_yyv
-#define yyval   gd_val
-#define yylloc  gd_lloc
-#define yyreds  gd_reds          /* With YYDEBUG defined */
-#define yytoks  gd_toks          /* With YYDEBUG defined */
-#define yylhs   gd_yylhs
-#define yylen   gd_yylen
-#define yydefred gd_yydefred
-#define yydgoto gd_yydgoto
-#define yysindex gd_yysindex
-#define yyrindex gd_yyrindex
-#define yygindex gd_yygindex
-#define yytable  gd_yytable
-#define yycheck  gd_yycheck
+#define yymaxdepth Curl_gd_maxdepth
+#define yyparse Curl_gd_parse
+#define yylex   Curl_gd_lex
+#define yyerror Curl_gd_error
+#define yylval  Curl_gd_lval
+#define yychar  Curl_gd_char
+#define yydebug Curl_gd_debug
+#define yypact  Curl_gd_pact
+#define yyr1    Curl_gd_r1
+#define yyr2    Curl_gd_r2
+#define yydef   Curl_gd_def
+#define yychk   Curl_gd_chk
+#define yypgo   Curl_gd_pgo
+#define yyact   Curl_gd_act
+#define yyexca  Curl_gd_exca
+#define yyerrflag Curl_gd_errflag
+#define yynerrs Curl_gd_nerrs
+#define yyps    Curl_gd_ps
+#define yypv    Curl_gd_pv
+#define yys     Curl_gd_s
+#define yy_yys  Curl_gd_yys
+#define yystate Curl_gd_state
+#define yytmp   Curl_gd_tmp
+#define yyv     Curl_gd_v
+#define yy_yyv  Curl_gd_yyv
+#define yyval   Curl_gd_val
+#define yylloc  Curl_gd_lloc
+#define yyreds  Curl_gd_reds          /* With YYDEBUG defined */
+#define yytoks  Curl_gd_toks          /* With YYDEBUG defined */
+#define yylhs   Curl_gd_yylhs
+#define yylen   Curl_gd_yylen
+#define yydefred Curl_gd_yydefred
+#define yydgoto Curl_gd_yydgoto
+#define yysindex Curl_gd_yysindex
+#define yyrindex Curl_gd_yyrindex
+#define yygindex Curl_gd_yygindex
+#define yytable  Curl_gd_yytable
+#define yycheck  Curl_gd_yycheck
 
 static int yylex ();
 static int yyerror ();
@@ -222,7 +227,7 @@ static int	yyRelSeconds;
 static int	yyRelYear;
 
 
-#line 205 "getdate.y"
+#line 210 "getdate.y"
 typedef union {
     int			Number;
     enum _MERIDIAN	Meridian;
@@ -305,11 +310,11 @@ static const short yyrhs[] = {    -1,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   221,   222,   225,   228,   231,   234,   237,   240,   243,   249,
-   255,   264,   270,   282,   285,   288,   294,   298,   302,   308,
-   312,   330,   336,   342,   346,   351,   355,   362,   370,   373,
-   376,   379,   382,   385,   388,   391,   394,   397,   400,   403,
-   406,   409,   412,   415,   418,   421,   424,   429,   462,   466
+   226,   227,   230,   233,   236,   239,   242,   245,   248,   254,
+   260,   269,   275,   287,   290,   293,   299,   303,   307,   313,
+   317,   335,   341,   347,   351,   356,   360,   367,   375,   378,
+   381,   384,   387,   390,   393,   396,   399,   402,   405,   408,
+   411,   414,   417,   420,   423,   426,   429,   434,   467,   471
 };
 #endif
 
@@ -933,37 +938,37 @@ yyreduce:
   switch (yyn) {
 
 case 3:
-#line 225 "getdate.y"
+#line 230 "getdate.y"
 {
 	    yyHaveTime++;
 	;
     break;}
 case 4:
-#line 228 "getdate.y"
+#line 233 "getdate.y"
 {
 	    yyHaveZone++;
 	;
     break;}
 case 5:
-#line 231 "getdate.y"
+#line 236 "getdate.y"
 {
 	    yyHaveDate++;
 	;
     break;}
 case 6:
-#line 234 "getdate.y"
+#line 239 "getdate.y"
 {
 	    yyHaveDay++;
 	;
     break;}
 case 7:
-#line 237 "getdate.y"
+#line 242 "getdate.y"
 {
 	    yyHaveRel++;
 	;
     break;}
 case 9:
-#line 243 "getdate.y"
+#line 248 "getdate.y"
 {
 	    yyHour = yyvsp[-1].Number;
 	    yyMinutes = 0;
@@ -972,7 +977,7 @@ case 9:
 	;
     break;}
 case 10:
-#line 249 "getdate.y"
+#line 254 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -981,7 +986,7 @@ case 10:
 	;
     break;}
 case 11:
-#line 255 "getdate.y"
+#line 260 "getdate.y"
 {
 	    yyHour = yyvsp[-3].Number;
 	    yyMinutes = yyvsp[-1].Number;
@@ -993,7 +998,7 @@ case 11:
 	;
     break;}
 case 12:
-#line 264 "getdate.y"
+#line 269 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -1002,7 +1007,7 @@ case 12:
 	;
     break;}
 case 13:
-#line 270 "getdate.y"
+#line 275 "getdate.y"
 {
 	    yyHour = yyvsp[-5].Number;
 	    yyMinutes = yyvsp[-3].Number;
@@ -1015,53 +1020,53 @@ case 13:
 	;
     break;}
 case 14:
-#line 282 "getdate.y"
+#line 287 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number;
 	;
     break;}
 case 15:
-#line 285 "getdate.y"
+#line 290 "getdate.y"
 {
 	    yyTimezone = yyvsp[0].Number - 60;
 	;
     break;}
 case 16:
-#line 289 "getdate.y"
+#line 294 "getdate.y"
 {
 	    yyTimezone = yyvsp[-1].Number - 60;
 	;
     break;}
 case 17:
-#line 294 "getdate.y"
+#line 299 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[0].Number;
 	;
     break;}
 case 18:
-#line 298 "getdate.y"
+#line 303 "getdate.y"
 {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = yyvsp[-1].Number;
 	;
     break;}
 case 19:
-#line 302 "getdate.y"
+#line 307 "getdate.y"
 {
 	    yyDayOrdinal = yyvsp[-1].Number;
 	    yyDayNumber = yyvsp[0].Number;
 	;
     break;}
 case 20:
-#line 308 "getdate.y"
+#line 313 "getdate.y"
 {
 	    yyMonth = yyvsp[-2].Number;
 	    yyDay = yyvsp[0].Number;
 	;
     break;}
 case 21:
-#line 312 "getdate.y"
+#line 317 "getdate.y"
 {
 	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
 	     The goal in recognizing YYYY/MM/DD is solely to support legacy
@@ -1082,7 +1087,7 @@ case 21:
 	;
     break;}
 case 22:
-#line 330 "getdate.y"
+#line 335 "getdate.y"
 {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
 	    yyYear = yyvsp[-2].Number;
@@ -1091,7 +1096,7 @@ case 22:
 	;
     break;}
 case 23:
-#line 336 "getdate.y"
+#line 341 "getdate.y"
 {
 	    /* e.g. 17-JUN-1992.  */
 	    yyDay = yyvsp[-2].Number;
@@ -1100,14 +1105,14 @@ case 23:
 	;
     break;}
 case 24:
-#line 342 "getdate.y"
+#line 347 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[0].Number;
 	;
     break;}
 case 25:
-#line 346 "getdate.y"
+#line 351 "getdate.y"
 {
 	    yyMonth = yyvsp[-3].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1115,14 +1120,14 @@ case 25:
 	;
     break;}
 case 26:
-#line 351 "getdate.y"
+#line 356 "getdate.y"
 {
 	    yyMonth = yyvsp[0].Number;
 	    yyDay = yyvsp[-1].Number;
 	;
     break;}
 case 27:
-#line 355 "getdate.y"
+#line 360 "getdate.y"
 {
 	    yyMonth = yyvsp[-1].Number;
 	    yyDay = yyvsp[-2].Number;
@@ -1130,7 +1135,7 @@ case 27:
 	;
     break;}
 case 28:
-#line 362 "getdate.y"
+#line 367 "getdate.y"
 {
 	    yyRelSeconds = -yyRelSeconds;
 	    yyRelMinutes = -yyRelMinutes;
@@ -1141,115 +1146,115 @@ case 28:
 	;
     break;}
 case 30:
-#line 373 "getdate.y"
+#line 378 "getdate.y"
 {
 	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 31:
-#line 376 "getdate.y"
+#line 381 "getdate.y"
 {
 	    yyRelYear += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 32:
-#line 379 "getdate.y"
+#line 384 "getdate.y"
 {
 	    yyRelYear += yyvsp[0].Number;
 	;
     break;}
 case 33:
-#line 382 "getdate.y"
+#line 387 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 34:
-#line 385 "getdate.y"
+#line 390 "getdate.y"
 {
 	    yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 35:
-#line 388 "getdate.y"
+#line 393 "getdate.y"
 {
 	    yyRelMonth += yyvsp[0].Number;
 	;
     break;}
 case 36:
-#line 391 "getdate.y"
+#line 396 "getdate.y"
 {
 	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 37:
-#line 394 "getdate.y"
+#line 399 "getdate.y"
 {
 	    yyRelDay += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 38:
-#line 397 "getdate.y"
+#line 402 "getdate.y"
 {
 	    yyRelDay += yyvsp[0].Number;
 	;
     break;}
 case 39:
-#line 400 "getdate.y"
+#line 405 "getdate.y"
 {
 	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 40:
-#line 403 "getdate.y"
+#line 408 "getdate.y"
 {
 	    yyRelHour += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 41:
-#line 406 "getdate.y"
+#line 411 "getdate.y"
 {
 	    yyRelHour += yyvsp[0].Number;
 	;
     break;}
 case 42:
-#line 409 "getdate.y"
+#line 414 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 43:
-#line 412 "getdate.y"
+#line 417 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 44:
-#line 415 "getdate.y"
+#line 420 "getdate.y"
 {
 	    yyRelMinutes += yyvsp[0].Number;
 	;
     break;}
 case 45:
-#line 418 "getdate.y"
+#line 423 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 46:
-#line 421 "getdate.y"
+#line 426 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number;
 	;
     break;}
 case 47:
-#line 424 "getdate.y"
+#line 429 "getdate.y"
 {
 	    yyRelSeconds += yyvsp[0].Number;
 	;
     break;}
 case 48:
-#line 430 "getdate.y"
+#line 435 "getdate.y"
 {
 	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
 	      yyYear = yyvsp[0].Number;
@@ -1282,13 +1287,13 @@ case 48:
 	  ;
     break;}
 case 49:
-#line 463 "getdate.y"
+#line 468 "getdate.y"
 {
 	    yyval.Meridian = MER24;
 	  ;
     break;}
 case 50:
-#line 467 "getdate.y"
+#line 472 "getdate.y"
 {
 	    yyval.Meridian = yyvsp[0].Meridian;
 	  ;
@@ -1515,7 +1520,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 472 "getdate.y"
+#line 477 "getdate.y"
 
 
 /* Include this file down here because bison inserts code above which

lib/getdate.y

@@ -80,6 +80,11 @@
 # include <string.h>
 #endif
 
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
 # define __attribute__(x)
 #endif
@@ -103,44 +108,44 @@
    then those parser generators need to be fixed instead of adding those
    names to this list. */
 
-#define yymaxdepth gd_maxdepth
-#define yyparse gd_parse
-#define yylex   gd_lex
-#define yyerror gd_error
-#define yylval  gd_lval
-#define yychar  gd_char
-#define yydebug gd_debug
-#define yypact  gd_pact
-#define yyr1    gd_r1
-#define yyr2    gd_r2
-#define yydef   gd_def
-#define yychk   gd_chk
-#define yypgo   gd_pgo
-#define yyact   gd_act
-#define yyexca  gd_exca
-#define yyerrflag gd_errflag
-#define yynerrs gd_nerrs
-#define yyps    gd_ps
-#define yypv    gd_pv
-#define yys     gd_s
-#define yy_yys  gd_yys
-#define yystate gd_state
-#define yytmp   gd_tmp
-#define yyv     gd_v
-#define yy_yyv  gd_yyv
-#define yyval   gd_val
-#define yylloc  gd_lloc
-#define yyreds  gd_reds          /* With YYDEBUG defined */
-#define yytoks  gd_toks          /* With YYDEBUG defined */
-#define yylhs   gd_yylhs
-#define yylen   gd_yylen
-#define yydefred gd_yydefred
-#define yydgoto gd_yydgoto
-#define yysindex gd_yysindex
-#define yyrindex gd_yyrindex
-#define yygindex gd_yygindex
-#define yytable  gd_yytable
-#define yycheck  gd_yycheck
+#define yymaxdepth Curl_gd_maxdepth
+#define yyparse Curl_gd_parse
+#define yylex   Curl_gd_lex
+#define yyerror Curl_gd_error
+#define yylval  Curl_gd_lval
+#define yychar  Curl_gd_char
+#define yydebug Curl_gd_debug
+#define yypact  Curl_gd_pact
+#define yyr1    Curl_gd_r1
+#define yyr2    Curl_gd_r2
+#define yydef   Curl_gd_def
+#define yychk   Curl_gd_chk
+#define yypgo   Curl_gd_pgo
+#define yyact   Curl_gd_act
+#define yyexca  Curl_gd_exca
+#define yyerrflag Curl_gd_errflag
+#define yynerrs Curl_gd_nerrs
+#define yyps    Curl_gd_ps
+#define yypv    Curl_gd_pv
+#define yys     Curl_gd_s
+#define yy_yys  Curl_gd_yys
+#define yystate Curl_gd_state
+#define yytmp   Curl_gd_tmp
+#define yyv     Curl_gd_v
+#define yy_yyv  Curl_gd_yyv
+#define yyval   Curl_gd_val
+#define yylloc  Curl_gd_lloc
+#define yyreds  Curl_gd_reds          /* With YYDEBUG defined */
+#define yytoks  Curl_gd_toks          /* With YYDEBUG defined */
+#define yylhs   Curl_gd_yylhs
+#define yylen   Curl_gd_yylen
+#define yydefred Curl_gd_yydefred
+#define yydgoto Curl_gd_yydgoto
+#define yysindex Curl_gd_yysindex
+#define yyrindex Curl_gd_yyrindex
+#define yygindex Curl_gd_yygindex
+#define yytable  Curl_gd_yytable
+#define yycheck  Curl_gd_yycheck
 
 static int yylex ();
 static int yyerror ();

lib/getpass.c

@@ -66,6 +66,11 @@
 #  endif
 #endif
 
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
 /* no perror? make an fprintf! */
 #ifndef HAVE_PERROR
 #  define perror(x) fprintf(stderr, "Error in: %s\n", x)

lib/http.c

@@ -283,7 +283,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
              "%s"
              "\r\n",
              hostname, remote_port,
-             (data->bits.proxy_user_passwd)?conn->allocptr.proxyuserpwd:"",
+             (conn->bits.proxy_user_passwd)?conn->allocptr.proxyuserpwd:"",
              (data->useragent?conn->allocptr.uagent:"")
              );
 
@@ -340,7 +340,7 @@ CURLcode Curl_http_connect(struct connectdata *conn)
       return CURLE_SSL_CONNECT_ERROR;
   }
 
-  if(data->bits.user_passwd && !data->bits.this_is_a_follow) {
+  if(conn->bits.user_passwd && !data->bits.this_is_a_follow) {
     /* Authorization: is requested, this is not a followed location, get the
        original host name */
     data->auth_host = strdup(conn->hostname);
@@ -423,7 +423,7 @@ CURLcode Curl_http(struct connectdata *conn)
     conn->allocptr.uagent=NULL;
   }
 
-  if((data->bits.user_passwd) && !checkheaders(data, "Authorization:")) {
+  if((conn->bits.user_passwd) && !checkheaders(data, "Authorization:")) {
     char *authorization;
 
     /* To prevent the user+password to get sent to other than the original
@@ -497,7 +497,7 @@ CURLcode Curl_http(struct connectdata *conn)
   if((data->bits.http_post ||
       data->bits.http_formpost ||
       data->bits.http_put) &&
-     data->resume_from) {
+     conn->resume_from) {
     /**********************************************************************
      * Resuming upload in HTTP means that we PUT or POST and that we have
      * got a resume_from value set. The resume value has already created
@@ -506,15 +506,15 @@ CURLcode Curl_http(struct connectdata *conn)
      * file size before we continue this venture in the dark lands of HTTP.
      *********************************************************************/
    
-    if(data->resume_from < 0 ) {
+    if(conn->resume_from < 0 ) {
       /*
        * This is meant to get the size of the present remote-file by itself.
        * We don't support this now. Bail out!
        */
-       data->resume_from = 0;
+       conn->resume_from = 0;
     }
 
-    if(data->resume_from) {
+    if(conn->resume_from) {
       /* do we still game? */
       int passed=0;
 
@@ -522,7 +522,7 @@ CURLcode Curl_http(struct connectdata *conn)
          input. If we knew it was a proper file we could've just
          fseek()ed but we only have a stream here */
       do {
-        int readthisamountnow = (data->resume_from - passed);
+        int readthisamountnow = (conn->resume_from - passed);
         int actuallyread;
 
         if(readthisamountnow > BUFSIZE)
@@ -537,11 +537,11 @@ CURLcode Curl_http(struct connectdata *conn)
                 passed);
           return CURLE_READ_ERROR;
         }
-      } while(passed != data->resume_from); /* loop until done */
+      } while(passed != conn->resume_from); /* loop until done */
 
       /* now, decrease the size of the read */
       if(data->infilesize>0) {
-        data->infilesize -= data->resume_from;
+        data->infilesize -= conn->resume_from;
 
         if(data->infilesize <= 0) {
           failf(data, "File already completely uploaded\n");
@@ -551,7 +551,7 @@ CURLcode Curl_http(struct connectdata *conn)
       /* we've passed, proceed as normal */
     }
   }
-  if(data->bits.set_range) {
+  if(conn->bits.use_range) {
     /*
      * A range is selected. We use different headers whether we're downloading
      * or uploading and we always let customized headers override our internal
@@ -559,23 +559,23 @@ CURLcode Curl_http(struct connectdata *conn)
      */
     if((data->httpreq == HTTPREQ_GET) &&
        !checkheaders(data, "Range:")) {
-      conn->allocptr.rangeline = aprintf("Range: bytes=%s\r\n", data->range);
+      conn->allocptr.rangeline = aprintf("Range: bytes=%s\r\n", conn->range);
     }
     else if((data->httpreq != HTTPREQ_GET) &&
             !checkheaders(data, "Content-Range:")) {
 
-      if(data->resume_from) {
+      if(conn->resume_from) {
         /* This is because "resume" was selected */
-        long total_expected_size= data->resume_from + data->infilesize;
+        long total_expected_size= conn->resume_from + data->infilesize;
         conn->allocptr.rangeline = aprintf("Content-Range: bytes %s%ld/%ld\r\n",
-                                      data->range, total_expected_size-1,
+                                      conn->range, total_expected_size-1,
                                       total_expected_size);
       }
       else {
         /* Range was selected and then we just pass the incoming range and 
            append total size */
         conn->allocptr.rangeline = aprintf("Content-Range: bytes %s/%d\r\n",
-                                      data->range, data->infilesize);
+                                      conn->range, data->infilesize);
       }
     }
   }
@@ -606,10 +606,14 @@ CURLcode Curl_http(struct connectdata *conn)
                  (data->bits.http_post || data->bits.http_formpost)?"POST":
                  (data->bits.http_put)?"PUT":"GET"),
                 ppath,
-                (data->bits.proxy_user_passwd && conn->allocptr.proxyuserpwd)?conn->allocptr.proxyuserpwd:"",
-                (data->bits.user_passwd && conn->allocptr.userpwd)?conn->allocptr.userpwd:"",
-                (data->bits.set_range && conn->allocptr.rangeline)?conn->allocptr.rangeline:"",
-                (data->useragent && *data->useragent && conn->allocptr.uagent)?conn->allocptr.uagent:"",
+                (conn->bits.proxy_user_passwd &&
+                 conn->allocptr.proxyuserpwd)?conn->allocptr.proxyuserpwd:"",
+                (conn->bits.user_passwd && conn->allocptr.userpwd)?
+                conn->allocptr.userpwd:"",
+                (conn->bits.use_range && conn->allocptr.rangeline)?
+                conn->allocptr.rangeline:"",
+                (data->useragent && *data->useragent && conn->allocptr.uagent)?
+                conn->allocptr.uagent:"",
                 (conn->allocptr.cookie?conn->allocptr.cookie:""), /* Cookie: <data> */
                 (conn->allocptr.host?conn->allocptr.host:""), /* Host: host */
                 http->p_pragma?http->p_pragma:"",
@@ -642,12 +646,21 @@ CURLcode Curl_http(struct connectdata *conn)
     if(data->timecondition) {
       struct tm *thistime;
 
+      /* Phil Karn (Fri, 13 Apr 2001) pointed out that the If-Modified-Since
+       * header family should have their times set in GMT as RFC2616 defines:
+       * "All HTTP date/time stamps MUST be represented in Greenwich Mean Time
+       * (GMT), without exception. For the purposes of HTTP, GMT is exactly
+       * equal to UTC (Coordinated Universal Time)." (see page 20 of RFC2616).
+       */
+
 #ifdef HAVE_LOCALTIME_R
       /* thread-safe version */
+      /* We assume that the presense of localtime_r() proves the presense
+         of gmtime_r() which is a bit ugly but might work */
       struct tm keeptime;
-      thistime = (struct tm *)localtime_r(&data->timevalue, &keeptime);
+      thistime = (struct tm *)gmtime_r(&data->timevalue, &keeptime);
 #else
-      thistime = localtime(&data->timevalue);
+      thistime = gmtime(&data->timevalue);
 #endif
       if(NULL == thistime) {
         failf(data, "localtime() failed!");

lib/if2ip.c

@@ -70,6 +70,11 @@
 #include "inet_ntoa_r.h"
 #endif
 
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
 #define SYS_ERROR -1
 
 char *Curl_if2ip(char *interface, char *buf, int buf_size)
@@ -90,6 +95,7 @@ char *Curl_if2ip(char *interface, char *buf, int buf_size)
     strcpy(req.ifr_name, interface);
     req.ifr_addr.sa_family = AF_INET;
     if (SYS_ERROR == ioctl(dummy, SIOCGIFADDR, &req, sizeof(req))) {
+      sclose(dummy);
       return NULL;
     }
     else {
@@ -104,7 +110,7 @@ char *Curl_if2ip(char *interface, char *buf, int buf_size)
       ip[buf_size - 1] = 0;
 #endif
     }
-    close(dummy);
+    sclose(dummy);
   }
   return ip;
 }

lib/libcurl.def

@@ -29,3 +29,4 @@ EXPORTS
  	curl_mvfprintf @ 20 ;
 	curl_strequal @ 21 ; 
 	curl_strnequal @ 22 ; 
+

lib/netrc.c

@@ -27,10 +27,26 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+
+
 #include <curl/curl.h>
 
 #include "strequal.h"
 
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
 /* Debug this single source file with:
    'make netrc' then run './netrc'!
 
@@ -60,7 +76,7 @@ int Curl_parsenetrc(char *host,
   char netrcbuffer[256];
   int retcode=1;
   
-  char *home = curl_getenv("HOME"); /* portable environment reader */
+  char *home = NULL; 
   int state=NOTHING;
 
   char state_login=0;
@@ -68,11 +84,25 @@ int Curl_parsenetrc(char *host,
 
 #define NETRC DOT_CHAR "netrc"
 
-  if(!home)
-    return -1;
+#if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)
+  struct passwd *pw;
+  pw= getpwuid(geteuid());
+  if (pw)
+    home = pw->pw_dir;
+#else
+  void *pw=NULL;
+#endif
+  
+  if(NULL == pw) {
+    home = curl_getenv("HOME"); /* portable environment reader */
+    if(!home) {
+      return -1;
+    }
+  }
 
   if(strlen(home)>(sizeof(netrcbuffer)-strlen(NETRC))) {
-    free(home);
+    if(NULL==pw)
+      free(home);
     return -1;
   }
 
@@ -140,7 +170,8 @@ int Curl_parsenetrc(char *host,
     fclose(file);
   }
 
-  free(home);
+  if(NULL==pw)
+    free(home);
 
   return retcode;
 }

lib/progress.c

@@ -91,11 +91,12 @@ static char *max5data(double bytes, char *max5)
 
 */
 
-void Curl_pgrsDone(struct UrlData *data)
+void Curl_pgrsDone(struct connectdata *conn)
 {
+  struct UrlData *data = conn->data;
   if(!(data->progress.flags & PGRS_HIDE)) {
     data->progress.lastshow=0;
-    Curl_pgrsUpdate(data); /* the final (forced) update */
+    Curl_pgrsUpdate(conn); /* the final (forced) update */
     fprintf(data->err, "\n");
   }
 }
@@ -134,6 +135,7 @@ void Curl_pgrsTime(struct UrlData *data, timerid timer)
 
 void Curl_pgrsStartNow(struct UrlData *data)
 {
+  data->progress.speeder_c = 0; /* reset the progress meter display */
   data->progress.start = Curl_tvnow();
 }
 
@@ -171,7 +173,7 @@ void Curl_pgrsSetUploadSize(struct UrlData *data, double size)
 
  */
 
-int Curl_pgrsUpdate(struct UrlData *data)
+int Curl_pgrsUpdate(struct connectdata *conn)
 {
   struct timeval now;
   int result;
@@ -184,6 +186,8 @@ int Curl_pgrsUpdate(struct UrlData *data)
   double total_transfer;
   double total_expected_transfer;
 
+  struct UrlData *data = conn->data;
+
   int nowindex = data->progress.speeder_c% CURR_TIME;
   int checkindex;
   int count;
@@ -197,15 +201,16 @@ int Curl_pgrsUpdate(struct UrlData *data)
   
   double total_estimate;
 
+
   if(data->progress.flags & PGRS_HIDE)
     ; /* We do enter this function even if we don't wanna see anything, since
          this is were lots of the calculations are being made that will be used
          even when not displayed! */
   else if(!(data->progress.flags & PGRS_HEADERS_OUT)) {
     if (!data->progress.callback) {
-      if(data->resume_from)
+      if(conn->resume_from)
         fprintf(data->err, "** Resuming transfer from byte position %d\n",
-                data->resume_from);
+                conn->resume_from);
       fprintf(data->err,
               "  %% Total    %% Received %% Xferd  Average Speed          Time             Curr.\n"
               "                                 Dload  Upload Total    Current  Left    Speed\n");

lib/progress.h

@@ -36,13 +36,13 @@ typedef enum {
   TIMER_LAST /* must be last */
 } timerid;
   
-void Curl_pgrsDone(struct UrlData *data);
+void Curl_pgrsDone(struct connectdata *);
 void Curl_pgrsStartNow(struct UrlData *data);
 void Curl_pgrsSetDownloadSize(struct UrlData *data, double size);
 void Curl_pgrsSetUploadSize(struct UrlData *data, double size);
 void Curl_pgrsSetDownloadCounter(struct UrlData *data, double size);
 void Curl_pgrsSetUploadCounter(struct UrlData *data, double size);
-int Curl_pgrsUpdate(struct UrlData *data);
+int Curl_pgrsUpdate(struct connectdata *);
 void Curl_pgrsTime(struct UrlData *data, timerid timer);
 
 

lib/sendf.c

@@ -236,7 +236,14 @@ CURLcode Curl_client_write(struct UrlData *data,
     }
   }
   if((type & CLIENTWRITE_HEADER) && data->writeheader) {
-    wrote = data->fwrite(ptr, 1, len, data->writeheader);
+    /*
+     * Write headers to the same callback or to the especially setup
+     * header callback function (added after version 7.7.1).
+     */
+    curl_write_callback writeit=
+      data->fwrite_header?data->fwrite_header:data->fwrite;
+
+    wrote = writeit(ptr, 1, len, data->writeheader);
     if(wrote != len) {
       failf (data, "Failed writing header");
       return CURLE_WRITE_ERROR;

lib/strequal.h

@@ -32,4 +32,8 @@ int curl_strnequal(const char *first, const char *second, size_t max);
 #define strequal(a,b) curl_strequal(a,b)
 #define strnequal(a,b,c) curl_strnequal(a,b,c)
 
+#ifndef HAVE_STRLCAT
+size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
 #endif

lib/telnet.c

@@ -82,6 +82,11 @@
 
 #include "arpa_telnet.h"
 
+/* The last #include file should be: */
+#ifdef MALLOCDEBUG
+#include "memdebug.h"
+#endif
+
 #define SUBBUFSIZE 512
 
 #define  SB_CLEAR(x)  x->subpointer = x->subbuffer;
@@ -745,7 +750,7 @@ static int check_telnet_options(struct connectdata *conn)
 
   /* Add the user name as an environment variable if it
      was given on the command line */
-  if(data->bits.user_passwd)
+  if(conn->bits.user_passwd)
   {
     char *buf = malloc(256);
     sprintf(buf, "USER,%s", data->user);

lib/transfer.c

@@ -127,7 +127,7 @@ Transfer(struct connectdata *c_conn)
   bool content_range = FALSE;	/* set TRUE if Content-Range: was found */
   int offset = 0;		/* possible resume offset read from the
                                    Content-Range: header */
-  int code = 0;			/* error code from the 'HTTP/1.? XXX' line */
+  int httpcode = 0;		/* error code from the 'HTTP/1.? XXX' line */
   int httpversion = -1;         /* the last digit in the HTTP/1.1 string */
 
   /* for the low speed checks: */
@@ -181,7 +181,7 @@ Transfer(struct connectdata *c_conn)
     int keepon=0;
 
     /* timeout every X second
-       - makes a better progressmeter (i.e even when no data is read, the
+       - makes a better progress meter (i.e even when no data is read, the
        meter can be updated and reflect reality)
        - allows removal of the alarm() crap
        - variable timeout is easier
@@ -310,8 +310,11 @@ Transfer(struct connectdata *c_conn)
               /* 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 */
+                  conn->size += bytecount; /* we append the already read
+                                              size */
+#endif
 
 
                 if ('\r' == *p)
@@ -321,7 +324,20 @@ Transfer(struct connectdata *c_conn)
 #if 0 /* headers are not included in the size */
                 Curl_pgrsSetDownloadSize(data, conn->size);
 #endif
-                header = FALSE;	/* no more header to parse! */
+
+                if(100 == httpcode) {
+                  /*
+                   * we have made a HTTP PUT or POST and this is 1.1-lingo
+                   * that tells us that the server is OK with this and ready
+                   * to receive our stuff.
+                   * However, we'll get more headers now so we must get
+                   * back into the header-parsing state!
+                   */
+                  header = TRUE;
+                  headerline = 0; /* we restart the header line counter */
+                }
+                else
+                  header = FALSE;	/* no more header to parse! */
 
                 /* now, only output this if the header AND body are requested:
                  */
@@ -336,29 +352,37 @@ Transfer(struct connectdata *c_conn)
 
                 data->header_size += p - data->headerbuff;
 
+                if(!header) {
+                  /*
+                   * end-of-headers.
+                   *
+                   * If we requested a "no body", this is a good time to get
+                   * out and return home.
+                   */
+                  if(data->bits.no_body)
+                    return CURLE_OK;
+                  break;		/* exit header line loop */
+                }
 
-                /*
-                 * end-of-headers.
-                 *
-                 * If we requested a "no body" and this isn't a "close"
-                 * connection, this is a good time to get out and return
-                 * home.
-                 */
-                if(!conn->bits.close && data->bits.no_body)
-                  return CURLE_OK;
-
-                break;		/* exit header line loop */
+                /* We continue reading headers, so reset the line-based
+                   header parsing variables hbufp && hbuflen */
+                hbufp = data->headerbuff;
+                hbuflen = 0;
+                continue;
               }
               
               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, &code)) {
+                if (2 == sscanf (p, " HTTP/1.%d %3d", &httpversion,
+                                 &httpcode)) {
                   /* 404 -> URL not found! */
                   if (
-                      ( ((data->bits.http_follow_location) && (code >= 400))
+                      ( ((data->bits.http_follow_location) &&
+                         (httpcode >= 400))
                         ||
-                        (!data->bits.http_follow_location && (code >= 300)))
+                        (!data->bits.http_follow_location &&
+                         (httpcode >= 300)))
                       && (data->bits.http_fail_on_error)) {
                     /* If we have been told to fail hard on HTTP-errors,
                        here is the check for that: */
@@ -366,7 +390,7 @@ Transfer(struct connectdata *c_conn)
                     failf (data, "The requested file was not found");
                     return CURLE_HTTP_NOT_FOUND;
                   }
-                  data->progress.httpcode = code;
+                  data->progress.httpcode = httpcode;
                   data->progress.httpversion = httpversion;
                   if(httpversion == 0)
                     /* Default action for HTTP/1.0 must be to close, unless
@@ -398,6 +422,18 @@ Transfer(struct connectdata *c_conn)
                 conn->bits.close = FALSE; /* don't close when done */
                 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"))) {
+                /*
+                 * A HTTP/1.0 reply with the 'Connection: keep-alive' line
+                 * tells us the connection will be kept alive for our
+                 * pleasure.  Default action for 1.0 is to close.
+                 *
+                 * [RFC2068, section 19.7.1] */
+                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"))) {
                 /*
@@ -429,7 +465,7 @@ Transfer(struct connectdata *c_conn)
                   /* 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! :-( */
-                  if (data->resume_from == offset) {
+                  if (conn->resume_from == offset) {
                     /* we asked for a resume and we got it */
                     content_range = TRUE;
                   }
@@ -447,7 +483,7 @@ Transfer(struct connectdata *c_conn)
                 if(data->bits.get_filetime)
                   data->progress.filetime = timeofdoc;
               }
-              else if ((code >= 300 && code < 400) &&
+              else if ((httpcode >= 300 && httpcode < 400) &&
                        (data->bits.http_follow_location) &&
                        strnequal("Location: ", p, 10)) {
                 /* this is the URL that the server advices us to get instead */
@@ -511,7 +547,7 @@ Transfer(struct connectdata *c_conn)
                   infof (data, "Follow to new URL: %s\n", conn->newurl);
                   return CURLE_OK;
                 }
-                else if (data->resume_from &&
+                else if (conn->resume_from &&
                          !content_range &&
                          (data->httpreq==HTTPREQ_GET)) {
                   /* we wanted to resume a download, although the server
@@ -521,7 +557,7 @@ Transfer(struct connectdata *c_conn)
                          "byte ranges. Cannot resume.");
                   return CURLE_HTTP_RANGE_ERROR;
                 }
-                else if(data->timecondition && !data->range) {
+                else if(data->timecondition && !conn->range) {
                   /* A time condition has been set AND no ranges have been
                      requested. This seems to be what chapter 13.3.4 of
                      RFC 2616 defines to be the correct action for a
@@ -660,7 +696,7 @@ Transfer(struct connectdata *c_conn)
       }
 
       now = Curl_tvnow();
-      if(Curl_pgrsUpdate(data))
+      if(Curl_pgrsUpdate(conn))
         urg = CURLE_ABORTED_BY_CALLBACK;
       else
         urg = Curl_speedcheck (data, now);
@@ -689,7 +725,12 @@ Transfer(struct connectdata *c_conn)
           contentlength-bytecount);
     return CURLE_PARTIAL_FILE;
   }
-  if(Curl_pgrsUpdate(data))
+  else if(conn->bits.chunk && conn->proto.http->chunk.datasize) {
+    failf(data, "transfer closed with at least %d bytes remaining",
+          conn->proto.http->chunk.datasize);
+    return CURLE_PARTIAL_FILE;
+  }
+  if(Curl_pgrsUpdate(conn))
     return CURLE_ABORTED_BY_CALLBACK;
 
   if(conn->bytecountp)
@@ -706,6 +747,14 @@ CURLcode Curl_perform(CURL *curl)
   struct UrlData *data = (struct UrlData *)curl;
   struct connectdata *conn=NULL;
   bool port=TRUE; /* allow data->use_port to set port to use */
+  char *newurl = NULL; /* possibly a new URL to follow to! */
+
+  if(!data->url)
+    /* we can't do anything wihout URL */
+    return CURLE_URL_MALFORMAT;
+
+  data->followlocation=0; /* reset the location-follow counter */
+  data->bits.this_is_a_follow = FALSE; /* reset this */
 
   Curl_pgrsStartNow(data);
 
@@ -716,11 +765,23 @@ CURLcode Curl_perform(CURL *curl)
       res = Curl_do(conn);
       if(res == CURLE_OK) {
         res = Transfer(conn); /* now fetch that URL please */
-        if(res == CURLE_OK)
+        if(res == CURLE_OK) {
+          /*
+           * We must duplicate the new URL here as the connection data
+           * may be free()ed in the Curl_done() function.
+           */
+          newurl = conn->newurl?strdup(conn->newurl):NULL;
+
           res = Curl_done(conn);
+        }
       }
 
-      if((res == CURLE_OK) && conn->newurl) {
+      /*
+       * Important: 'conn' cannot be used here, since it may have been closed
+       * in 'Curl_done' or other functions.
+       */
+
+      if((res == CURLE_OK) && newurl) {
         /* Location: redirect
  
            This is assumed to happen for HTTP(S) only!
@@ -733,9 +794,6 @@ CURLcode Curl_perform(CURL *curl)
 
 	if (data->maxredirs && (data->followlocation >= data->maxredirs)) {
 	  failf(data,"Maximum (%d) redirects followed", data->maxredirs);
-#ifdef USE_OLD_DISCONNECT
-          curl_disconnect(c_connect);
-#endif
           res=CURLE_TOO_MANY_REDIRECTS;
 	  break;
 	}
@@ -760,7 +818,7 @@ CURLcode Curl_perform(CURL *curl)
           data->bits.http_set_referer = TRUE; /* might have been false */
         }
 
-        if(2 != sscanf(conn->newurl, "%15[^:]://%c", prot, &letter)) {
+        if(2 != sscanf(newurl, "%15[^:]://%c", prot, &letter)) {
           /***
            *DANG* this is an RFC 2068 violation. The URL is supposed
            to be absolute and this doesn't seem to be that!
@@ -773,19 +831,21 @@ CURLcode Curl_perform(CURL *curl)
           char *pathsep;
           char *newest;
 
+          /* we must make our own copy of the URL to play with, as it may
+             point to read-only data */
+          char *url_clone=strdup(data->url);
+
+          if(!url_clone)
+            return CURLE_OUT_OF_MEMORY;
+
           /* protsep points to the start of the host name */
-          protsep=strstr(data->url, "//");
+          protsep=strstr(url_clone, "//");
           if(!protsep)
-            protsep=data->url;
-          else {
-            port=FALSE; /* we got a full URL and thus we should not obey the
-                           port number that might have been set by the user
-                           in data->use_port */
-
+            protsep=url_clone;
+          else
             protsep+=2; /* pass the slashes */
-          }
 
-          if('/' != conn->newurl[0]) {
+          if('/' != newurl[0]) {
             /* First we need to find out if there's a ?-letter in the URL,
                and cut it and the right-side of that off */
             pathsep = strrchr(protsep, '?');
@@ -806,16 +866,17 @@ CURLcode Curl_perform(CURL *curl)
               *pathsep=0;
           }
 
-          newest=(char *)malloc( strlen(data->url) +
+          newest=(char *)malloc( strlen(url_clone) +
                                  1 + /* possible slash */
-                                 strlen(conn->newurl) + 1/* zero byte */);
+                                 strlen(newurl) + 1/* zero byte */);
 
           if(!newest)
             return CURLE_OUT_OF_MEMORY;
-          sprintf(newest, "%s%s%s", data->url, ('/' == conn->newurl[0])?"":"/",
-                  conn->newurl);
-          free(conn->newurl);
-          conn->newurl = newest;
+          sprintf(newest, "%s%s%s", url_clone, ('/' == newurl[0])?"":"/",
+                  newurl);
+          free(newurl);
+          free(url_clone);
+          newurl = newest;
         }
         else {
           /* This is an absolute URL, don't use the custom port number */
@@ -826,8 +887,8 @@ CURLcode Curl_perform(CURL *curl)
           free(data->url);
       
         /* TBD: set the URL with curl_setopt() */
-        data->url = conn->newurl;
-        conn->newurl = NULL; /* don't show! */
+        data->url = newurl;
+
         data->bits.urlstringalloc = TRUE; /* the URL is allocated */
 
         infof(data, "Follows Location: to new URL: '%s'\n", data->url);
@@ -841,7 +902,6 @@ CURLcode Curl_perform(CURL *curl)
         switch(data->progress.httpcode) {
         case 300: /* Multiple Choices */
         case 301: /* Moved Permanently */
-        case 302: /* Found */
         case 306: /* Not used */
         case 307: /* Temporary Redirect */
         default:  /* for all unknown ones */
@@ -849,6 +909,24 @@ CURLcode Curl_perform(CURL *curl)
            * seem to be OK to POST to.
            */
           break;
+        case 302: /* Found */
+          /* (From 10.3.3)
+
+            Note: RFC 1945 and RFC 2068 specify that the client is not allowed
+            to change the method on the redirected request.  However, most
+            existing user agent implementations treat 302 as if it were a 303
+            response, performing a GET on the Location field-value regardless
+            of the original request method. The status codes 303 and 307 have
+            been added for servers that wish to make unambiguously clear which
+            kind of reaction is expected of the client.
+
+            (From 10.3.4)
+
+            Note: Many pre-HTTP/1.1 user agents do not understand the 303
+            status. When interoperability with such clients is a concern, the
+            302 status code may be used instead, since most user agents react
+            to a 302 response as described here for 303.             
+          */
         case 303: /* See Other */
           /* Disable both types of POSTs, since doing a second POST when
            * following isn't what anyone would want! */
@@ -872,24 +950,19 @@ CURLcode Curl_perform(CURL *curl)
            */
           break;
         }
-#ifdef USE_OLD_DISCONNECT
-        curl_disconnect(c_connect);
-#endif
         continue;
       }
-
-#ifdef USE_OLD_DISCONNECT
-      curl_disconnect(c_connect);
-#endif
     }
     break; /* it only reaches here when this shouldn't loop */
 
   } while(1); /* loop if Location: */
 
-  if(conn->newurl) {
-    free(conn->newurl);
-    conn->newurl = NULL;
-  }
+  if(newurl)
+    free(newurl);
+
+  /* make sure the alarm is switched off! */
+  if(data->timeout || data->connecttimeout)
+    myalarm(0);
 
   return res;
 }

lib/url.c

@@ -122,6 +122,19 @@ static unsigned int ConnectionStore(struct UrlData *data,
                                     struct connectdata *conn);
 
 
+#if !defined(WIN32)||defined(__CYGWIN32__)
+#ifndef RETSIGTYPE
+#define RETSIGTYPE void
+#endif
+static
+RETSIGTYPE alarmfunc(int signal)
+{
+  /* this is for "-ansi -Wall -pedantic" to stop complaining!   (rabe) */
+  (void)signal;
+  return;
+}
+#endif
+
 CURLcode Curl_close(CURL *curl)
 {
   struct UrlData *data=(struct UrlData *)curl;
@@ -140,13 +153,6 @@ CURLcode Curl_close(CURL *curl)
     data->bits.httpproxy=FALSE;
   }
 
-
-  if(data->bits.rangestringalloc) {
-    free(data->range);
-    data->range=NULL;
-    data->bits.rangestringalloc=0; /* free now */
-  }
-
   /* check for allocated [URL] memory to free: */
   if(data->freethis)
     free(data->freethis);
@@ -186,6 +192,9 @@ CURLcode Curl_open(CURL **curl, char *url)
 {
   /* We don't yet support specifying the URL at this point */
   struct UrlData *data;
+#ifdef HAVE_SIGACTION
+  struct sigaction sigact;
+#endif
 
   /* Very simple start-up: alloc the struct, init it with zeroes and return */
   data = (struct UrlData *)malloc(sizeof(struct UrlData));
@@ -234,6 +243,26 @@ CURLcode Curl_open(CURL **curl, char *url)
     memset(data->connects, 0, sizeof(struct connectdata *)*data->numconnects);
 
     *curl = data;
+
+    /*************************************************************
+     * Set signal handler
+     *************************************************************/
+#ifdef HAVE_SIGACTION
+    sigaction(SIGALRM, NULL, &sigact);
+    sigact.sa_handler = alarmfunc;
+#ifdef SA_RESTART
+    /* HPUX doesn't have SA_RESTART but defaults to that behaviour! */
+    sigact.sa_flags &= ~SA_RESTART;
+#endif
+    sigaction(SIGALRM, &sigact, NULL);
+#else
+    /* no sigaction(), revert to the much lamer signal() */
+#ifdef HAVE_SIGNAL
+    signal(SIGALRM, alarmfunc);
+#endif
+
+#endif
+
     return CURLE_OK;
   }
 
@@ -595,6 +624,12 @@ CURLcode Curl_setopt(CURL *curl, CURLoption option, ...)
      */
     data->timeout = va_arg(param, long);
     break;
+  case CURLOPT_CONNECTTIMEOUT:
+    /*
+     * The maximum time you allow curl to use to connect.
+     */
+    data->connecttimeout = va_arg(param, long);
+    break;
   case CURLOPT_MAXREDIRS:
     /*
      * The maximum amount of hops you allow curl to follow Location:
@@ -613,7 +648,6 @@ CURLcode Curl_setopt(CURL *curl, CURLoption option, ...)
      * user:password to use in the operation
      */
     data->userpwd = va_arg(param, char *);
-    data->bits.user_passwd = data->userpwd?1:0;
     break;
   case CURLOPT_POSTQUOTE:
     /*
@@ -657,20 +691,19 @@ CURLcode Curl_setopt(CURL *curl, CURLoption option, ...)
      * user:password needed to use the proxy
      */
     data->proxyuserpwd = va_arg(param, char *);
-    data->bits.proxy_user_passwd = data->proxyuserpwd?1:0;
     break;
   case CURLOPT_RANGE:
     /*
      * What range of the file you want to transfer
      */
-    data->range = va_arg(param, char *);
-    data->bits.set_range = data->range?1:0;
+    data->set_range = va_arg(param, char *);
+    data->bits.set_range = data->set_range?1:0;
     break;
   case CURLOPT_RESUME_FROM:
     /*
      * Resume transfer at the give file position
      */
-    data->resume_from = va_arg(param, long);
+    data->set_resume_from = va_arg(param, long);
     break;
   case CURLOPT_STDERR:
     /*
@@ -679,6 +712,12 @@ CURLcode Curl_setopt(CURL *curl, CURLoption option, ...)
      */
     data->err = va_arg(param, FILE *);
     break;
+  case CURLOPT_HEADERFUNCTION:
+    /*
+     * Set header write callback
+     */
+    data->fwrite_header = va_arg(param, curl_write_callback);
+    break;
   case CURLOPT_WRITEFUNCTION:
     /*
      * Set data write callback
@@ -750,29 +789,26 @@ CURLcode Curl_setopt(CURL *curl, CURLoption option, ...)
   return CURLE_OK;
 }
 
-#if !defined(WIN32)||defined(__CYGWIN32__)
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
-#endif
-static
-RETSIGTYPE alarmfunc(int signal)
-{
-  /* this is for "-ansi -Wall -pedantic" to stop complaining!   (rabe) */
-  (void)signal;
-  return;
-}
-#endif
-
 CURLcode Curl_disconnect(struct connectdata *conn)
 {
   if(!conn)
     return CURLE_OK; /* this is closed and fine already */
 
-  infof(conn->data, "Closing live connection (#%d)\n", conn->connectindex);
+  /*
+   * The range string is usually freed in curl_done(), but we might
+   * get here *instead* if we fail prematurely. Thus we need to be able
+   * to free this resource here as well.
+   */
+  if(conn->bits.rangestringalloc) {
+    free(conn->range);
+    conn->bits.rangestringalloc = FALSE;
+  }
 
-  if(-1 != conn->connectindex)
+  if(-1 != conn->connectindex) {
     /* unlink ourselves! */
+    infof(conn->data, "Closing live connection (#%d)\n", conn->connectindex);
     conn->data->connects[conn->connectindex] = NULL;
+  }
 
   if(conn->curl_disconnect)
     /* This is set if protocol-specific cleanups should be made */
@@ -789,6 +825,9 @@ CURLcode Curl_disconnect(struct connectdata *conn)
     free(conn->hostent_buf);
 #endif
 
+  if(conn->newurl)
+    free(conn->newurl);
+
   if(conn->path) /* the URL path part */
     free(conn->path);
 
@@ -909,9 +948,11 @@ ConnectionExists(struct UrlData *data,
           data->connects[i]=NULL; /* nothing here */
           continue; /* try another one now */
         }
+
+        *usethis = check;
+        return TRUE; /* yes, we found one to use! */
+        
       }
-      *usethis = check;
-      return TRUE; /* yes, we found one to use! */
     }
     else { /* The requested needle connection is using a proxy,
               is the checked one using the same? */
@@ -1022,6 +1063,11 @@ ConnectionStore(struct UrlData *data,
 static CURLcode ConnectPlease(struct UrlData *data,
                               struct connectdata *conn)
 {
+#if defined(WIN32)
+  unsigned long nonblock = 0;
+  fd_set connectfd;
+  struct timeval conntimeout;
+#endif
 
 #ifndef ENABLE_IPV6
   conn->firstsocket = socket(AF_INET, SOCK_STREAM, 0);
@@ -1164,12 +1210,14 @@ static CURLcode ConnectPlease(struct UrlData *data,
 #ifdef ENABLE_IPV6
   conn->firstsocket = -1;
   for (ai = conn->hp; ai; ai = ai->ai_next) {
-    conn->firstsocket = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    conn->firstsocket = socket(ai->ai_family,
+                               ai->ai_socktype,
+                               ai->ai_protocol);
     if (conn->firstsocket < 0)
       continue;
 
     if (connect(conn->firstsocket, ai->ai_addr, ai->ai_addrlen) < 0) {
-      close(conn->firstsocket);
+      sclose(conn->firstsocket);
       conn->firstsocket = -1;
       continue;
     }
@@ -1182,10 +1230,33 @@ static CURLcode ConnectPlease(struct UrlData *data,
     return CURLE_COULDNT_CONNECT;
   }
 #else
+  /* non-zero nonblock value sets socket as nonblocking under Win32 */
+#if defined(WIN32)
+  FD_ZERO (&connectfd);
+  FD_SET(conn->firstsocket, &connectfd);
+  if (conn->data->connecttimeout > 0) {
+    nonblock = 1;
+  }
+  ioctlsocket(conn->firstsocket, FIONBIO, &nonblock);
+#endif
   if (connect(conn->firstsocket,
               (struct sockaddr *) &(conn->serv_addr),
               sizeof(conn->serv_addr)
               ) < 0) {
+#if defined(WIN32)
+    conntimeout.tv_sec = conn->data->connecttimeout;
+    conntimeout.tv_usec = 0;	
+    if(-1 != select (conn->firstsocket + 1, NULL, &connectfd, NULL, &conntimeout)) {
+      if (FD_ISSET(conn->firstsocket, &connectfd)) {
+        /* shut off non-blocking again */
+        nonblock = 0;
+        ioctlsocket(conn->firstsocket, FIONBIO, &nonblock);
+        return CURLE_OK;
+      }
+      else
+        errno = EINTR;
+    }
+#endif
     switch(errno) {
 #ifdef ECONNREFUSED
       /* this should be made nicer */
@@ -1246,9 +1317,6 @@ static CURLcode Connect(struct UrlData *data,
   struct connectdata *conn;
   struct connectdata *conn_temp;
   char endbracket;
-#ifdef HAVE_SIGACTION
-  struct sigaction sigact;
-#endif
   int urllen;
 
   /*************************************************************
@@ -1283,15 +1351,23 @@ static CURLcode Connect(struct UrlData *data,
   conn->secondarysocket = -1; /* no file descriptor */
   conn->connectindex = -1;    /* no index */
   conn->bits.httpproxy = data->bits.httpproxy; /* proxy-or-not status */
+  conn->bits.use_range = data->bits.set_range; /* range status */
+  conn->range = data->set_range;               /* clone the range setting */
+  conn->resume_from = data->set_resume_from;   /* inherite resume_from */
 
   /* Default protocol-independent behavior doesn't support persistant
      connections, so we set this to force-close. Protocols that support
      this need to set this to FALSE in their "curl_do" functions. */
   conn->bits.close = TRUE;
+  
+  /* inherite initial knowledge from the data struct */
+  conn->bits.user_passwd = data->userpwd?1:0;
+  conn->bits.proxy_user_passwd = data->proxyuserpwd?1:0;
 
   /* Store creation time to help future close decision making */
   conn->created = Curl_tvnow();
 
+
   /***********************************************************
    * We need to allocate memory to store the path in. We get the size of the
    * full URL to be sure, and we need to make it at least 256 bytes since
@@ -1366,6 +1442,8 @@ static CURLcode Connect(struct UrlData *data,
 #ifdef USE_SSLEAY
       else if(strnequal(conn->gname, "HTTPS", 5))
         strcpy(conn->protostr, "https");
+      else if(strnequal(conn->gname, "FTPS", 4))
+        strcpy(conn->protostr, "ftps");
 #endif /* USE_SSLEAY */
       else if(strnequal(conn->gname, "TELNET", 6))
         strcpy(conn->protostr, "telnet");
@@ -1383,30 +1461,11 @@ static CURLcode Connect(struct UrlData *data,
 
   buf = data->buffer; /* this is our buffer */
 
-  /*************************************************************
-   * Set signal handler
-   *************************************************************/
-#ifdef HAVE_SIGACTION
-  sigaction(SIGALRM, NULL, &sigact);
-  sigact.sa_handler = alarmfunc;
-#ifdef SA_RESTART
-  /* HPUX doesn't have SA_RESTART but defaults to that behaviour! */
-  sigact.sa_flags &= ~SA_RESTART;
-#endif
-  sigaction(SIGALRM, &sigact, NULL);
-#else
-  /* no sigaction(), revert to the much lamer signal() */
-#ifdef HAVE_SIGNAL
-  signal(SIGALRM, alarmfunc);
-#endif
-
-#endif
-
   /*************************************************************
    * Take care of user and password authentication stuff
    *************************************************************/
 
-  if(data->bits.user_passwd && !data->bits.use_netrc) {
+  if(conn->bits.user_passwd && !data->bits.use_netrc) {
     data->user[0] =0;
     data->passwd[0]=0;
 
@@ -1431,7 +1490,7 @@ static CURLcode Connect(struct UrlData *data,
   /*************************************************************
    * Take care of proxy authentication stuff
    *************************************************************/
-  if(data->bits.proxy_user_passwd) {
+  if(conn->bits.proxy_user_passwd) {
     data->proxyuser[0] =0;
     data->proxypasswd[0]=0;
 
@@ -1526,7 +1585,19 @@ static CURLcode Connect(struct UrlData *data,
 	/* read the protocol proxy: */
 	prox=curl_getenv(proxy_env);
 
-	if(!prox) {
+        /*
+         * We don't try the uppercase version of HTTP_PROXY because of
+         * security reasons:
+         *
+         * When curl is used in a webserver application
+         * environment (cgi or php), this environment variable can
+         * be controlled by the web server user by setting the
+         * http header 'Proxy:' to some value.
+         * 
+         * This can cause 'internal' http/ftp requests to be
+         * arbitrarily redirected by any external attacker.
+         */
+	if(!prox && !strequal("http_proxy", proxy_env)) {
           /* There was no lowercase variable, try the uppercase version: */
 	  for(envp = proxy_env; *envp; envp++)
 	    *envp = toupper(*envp);
@@ -1585,24 +1656,29 @@ static CURLcode Connect(struct UrlData *data,
    * server, we just fail since we can't rewind the file writing from within
    * this function.
    ***********************************************************/
-  if(data->resume_from) {
-    if(!data->bits.set_range) {
+  if(conn->resume_from) {
+    if(!conn->bits.use_range) {
       /* if it already was in use, we just skip this */
-      snprintf(resumerange, sizeof(resumerange), "%d-", data->resume_from);
-      data->range=strdup(resumerange); /* tell ourselves to fetch this range */
-      data->bits.rangestringalloc = TRUE; /* mark as allocated */
-      data->bits.set_range = 1; /* switch on range usage */
+      snprintf(resumerange, sizeof(resumerange), "%d-", conn->resume_from);
+      conn->range=strdup(resumerange); /* tell ourselves to fetch this range */
+      conn->bits.rangestringalloc = TRUE; /* mark as allocated */
+      conn->bits.use_range = 1; /* switch on range usage */
     }
   }
 
   /*************************************************************
    * Set timeout if that is being used
    *************************************************************/
-  if(data->timeout) {
+  if(data->timeout || data->connecttimeout) {
     /* We set the timeout on the connection/resolving phase first, separately
      * from the download/upload part to allow a maximum time on everything */
-    myalarm(data->timeout); /* this sends a signal when the timeout fires
-			       off, and that will abort system calls */
+
+    /* myalarm() makes a signal get sent when the timeout fires off, and that
+       will abort system calls */
+    if(data->connecttimeout)
+      myalarm(data->connecttimeout);
+    else
+      myalarm(data->timeout);
   }
 
   /*************************************************************
@@ -1649,8 +1725,19 @@ static CURLcode Connect(struct UrlData *data,
     conn->curl_done = Curl_http_done;
     conn->curl_close = Curl_http_close;
   }
-  else if(strequal(conn->protostr, "FTP")) {
+  else if(strequal(conn->protostr, "FTP") ||
+          strequal(conn->protostr, "FTPS")) {
     char *type;
+
+    if(strequal(conn->protostr, "FTPS")) {
+#ifdef USE_SSLEAY
+      conn->protocol |= PROT_FTPS;
+#else
+      failf(data, "libcurl was built with SSL disabled, ftps: not supported!");
+      return CURLE_UNSUPPORTED_PROTOCOL;
+#endif /* !USE_SSLEAY */
+    }
+
     conn->port = (data->use_port && allow_port)?data->use_port:PORT_FTP;
     conn->remote_port = PORT_FTP;
     conn->protocol |= PROT_FTP;
@@ -1659,6 +1746,12 @@ static CURLcode Connect(struct UrlData *data,
        !data->bits.tunnel_thru_httpproxy) {
       /* Unless we have asked to tunnel ftp operations through the proxy, we
          switch and use HTTP operations only */
+      if(conn->protocol & PROT_FTPS) {
+        /* FTPS is a hacked protocol and does not work through your
+           ordinary http proxy! */
+        failf(data, "ftps does not work through http proxy!");
+        return CURLE_UNSUPPORTED_PROTOCOL;
+      }
       conn->curl_do = Curl_http;
       conn->curl_done = Curl_http_done;
       conn->curl_close = Curl_http_close;
@@ -1754,7 +1847,7 @@ static CURLcode Connect(struct UrlData *data,
             conn->hostname);
     }
     else
-      data->bits.user_passwd = 1; /* enable user+password */
+      conn->bits.user_passwd = 1; /* enable user+password */
 
     /* weather we failed or not, we don't know which fields that were filled
        in anyway */
@@ -1763,7 +1856,7 @@ static CURLcode Connect(struct UrlData *data,
     if(!data->passwd[0])
       strcpy(data->passwd, CURL_DEFAULT_PASSWORD);
   }
-  else if(!(data->bits.user_passwd) &&
+  else if(!(conn->bits.user_passwd) &&
 	  (conn->protocol & (PROT_FTP|PROT_HTTP)) ) {
     /* This is a FTP or HTTP URL, and we haven't got the user+password in
      * the extra parameter, we will now try to extract the possible
@@ -1812,7 +1905,7 @@ static CURLcode Connect(struct UrlData *data,
       }
 
       conn->name = ++ptr;
-      data->bits.user_passwd=1; /* enable user+password */
+      conn->bits.user_passwd=TRUE; /* enable user+password */
     }
     else {
       strcpy(data->user, CURL_DEFAULT_USER);
@@ -1859,10 +1952,6 @@ static CURLcode Connect(struct UrlData *data,
        host name name, so that we can re-use an existing connection
        that may exist registered to the same proxy host. */
 
-#ifdef ENABLE_IPV6
-    failf(data, "proxy yet to be supported");
-    return CURLE_OUT_OF_MEMORY;
-#else
     char *prox_portno;
     char *endofprot;
 
@@ -1907,7 +1996,6 @@ static CURLcode Connect(struct UrlData *data,
     conn->proxyhost = strdup(proxyptr);
 
     free(proxydup); /* free the duplicate pointer and not the modified */
-#endif /* end of IPv4-section */
   }
 
   /*************************************************************
@@ -1934,8 +2022,8 @@ static CURLcode Connect(struct UrlData *data,
     free(conn->path);        /* free the previous path pointer */
 
     /* we need these pointers if we speak over a proxy */
-    conn->name = old_conn->name;
-    conn->hostname = old_conn->hostname;
+    conn->name = conn->gname;
+    conn->hostname = old_conn->gname;
 
     conn->path = path;       /* use this one */
     conn->ppath = path;      /* set this too */
@@ -1987,7 +2075,12 @@ static CURLcode Connect(struct UrlData *data,
        if we're reusing an existing connection. */
 
     /* resolve proxy */
+#ifdef ENABLE_IPV6
+      /* it might already be set if reusing a connection */
+    conn->hp = Curl_getaddrinfo(data, conn->proxyhost, conn->port);
+#else
     conn->hp = Curl_gethost(data, conn->proxyhost, &conn->hostent_buf);
+#endif
     if(!conn->hp) {
       failf(data, "Couldn't resolve proxy '%s'", conn->proxyhost);
       return CURLE_COULDNT_RESOLVE_PROXY;
@@ -1998,7 +2091,7 @@ static CURLcode Connect(struct UrlData *data,
   /*************************************************************
    * Proxy authentication
    *************************************************************/
-  if(data->bits.proxy_user_passwd) {
+  if(conn->bits.proxy_user_passwd) {
     char *authorization;
     snprintf(data->buffer, BUFSIZE, "%s:%s",
              data->proxyuser, data->proxypasswd);
@@ -2109,8 +2202,10 @@ CURLcode Curl_connect(struct UrlData *data,
     /* We're not allowed to return failure with memory left allocated
        in the connectdata struct, free those here */
     conn = (struct connectdata *)*in_connect;
-    if(conn)
+    if(conn) {
       Curl_disconnect(conn);      /* close the connection */
+      *in_connect = NULL;         /* return a NULL */
+    }
   }
   return code;
 }
@@ -2121,13 +2216,20 @@ CURLcode Curl_done(struct connectdata *conn)
   struct UrlData *data=conn->data;
   CURLcode result;
 
+  /* cleanups done even if the connection is re-used */
+
+  if(conn->bits.rangestringalloc) {
+    free(conn->range);
+    conn->bits.rangestringalloc = FALSE;
+  }
+
   /* this calls the protocol-specific function pointer previously set */
   if(conn->curl_done)
     result = conn->curl_done(conn);
   else
     result = CURLE_OK;
 
-  Curl_pgrsDone(data); /* done with the operation */
+  Curl_pgrsDone(conn); /* done with the operation */
 
   /* if data->bits.reuse_forbid is TRUE, it means the libcurl client has
      forced us to close this no matter what we think.

lib/urldata.h

@@ -183,6 +183,11 @@ struct ConnectBits {
   bool reuse; /* if set, this is a re-used connection */
   bool chunk; /* if set, this is a chunked transfer-encoding */
   bool httpproxy; /* if set, this transfer is done through a http proxy */
+  bool user_passwd;       /* do we use user+password for this connection? */
+  bool proxy_user_passwd; /* user+password for the proxy? */
+
+  bool use_range;
+  bool rangestringalloc; /* the range string is malloc()'ed */
 };
 
 /*
@@ -205,6 +210,7 @@ struct connectdata {
 #define PROT_DICT    (1<<6)
 #define PROT_LDAP    (1<<7)
 #define PROT_FILE    (1<<8)
+#define PROT_FTPS    (1<<9)
 
 #ifdef ENABLE_IPV6
   struct addrinfo *hp; /* host info pointer list */
@@ -225,6 +231,10 @@ struct connectdata {
   char *ppath;
   long bytecount;
 
+  char *range; /* range, if used. See README for detailed specification on
+                  this syntax. */
+  int resume_from; /* continue [ftp] transfer from here */
+
   char *proxyhost; /* name of the http proxy host */
 
   struct timeval now;     /* "current" time */
@@ -291,7 +301,6 @@ struct connectdata {
 		   document headers */
 
 #ifdef KRB4
-
   enum protection_level command_prot;
   enum protection_level data_prot;
   enum protection_level request_data_prot;
@@ -391,17 +400,14 @@ struct Configbits {
   bool httpproxy;
   bool mute;
   bool no_body;
-  bool proxy_user_passwd;
   bool set_port;
   bool set_range;
   bool upload;
   bool use_netrc;
-  bool user_passwd;
   bool verbose;
   bool this_is_a_follow; /* this is a followed Location: request */
   bool krb4; /* kerberos4 connection requested */
   bool proxystringalloc; /* the http proxy string is malloc()'ed */
-  bool rangestringalloc; /* the range string is malloc()'ed */
   bool urlstringalloc;   /* the URL string is malloc()'ed */
   bool reuse_forbid;     /* if this is forbidden to be reused, close 
                             after use */
@@ -460,8 +466,8 @@ struct UrlData {
   struct ssl_config_data ssl; /* this is for ssl-stuff */
 
   char *userpwd;  /* <user:password>, if used */
-  char *range; /* range, if used. See README for detailed specification on
-                  this syntax. */
+  char *set_range; /* range, if used. See README for detailed specification on
+                      this syntax. */
 
   /* stuff related to HTTP */
 
@@ -485,6 +491,9 @@ struct UrlData {
   /* function that stores the output:*/
   curl_write_callback fwrite;
 
+  /* optional function that stores the header output:*/
+  curl_write_callback fwrite_header;
+
   /* function that reads the input:*/
   curl_read_callback fread;
 
@@ -496,8 +505,9 @@ struct UrlData {
   curl_passwd_callback fpasswd;
   void *passwd_client; /* pointer to pass to the passwd callback */
 
-  long timeout; /* in seconds, 0 means no timeout */
-  long infilesize; /* size of file to upload, -1 means unknown */
+  long timeout;        /* in seconds, 0 means no timeout */
+  long connecttimeout; /* in seconds, 0 means no timeout */
+  long infilesize;     /* size of file to upload, -1 means unknown */
 
   char buffer[BUFSIZE+1]; /* buffer with size BUFSIZE */
 
@@ -506,7 +516,7 @@ struct UrlData {
   long low_speed_limit; /* bytes/second */
   long low_speed_time;  /* number of seconds */
 
-  int resume_from;    /* continue [ftp] transfer from here */
+  int set_resume_from;    /* continue [ftp] transfer from here */
 
   char *cookie;       /* HTTP cookie string to send */
 
@@ -552,10 +562,6 @@ struct UrlData {
   char proxypasswd[MAX_CURL_PASSWORD_LENGTH];
 
   char *krb4_level; /* what security level */
-#ifdef KRB4
-  FILE *cmdchannel;
-#endif
-
   struct timeval keeps_speed; /* this should be request-specific */
 
   /* 'connects' will be an allocated array with pointers. If the pointer is

lib/version.c

@@ -38,6 +38,23 @@ char *curl_version(void)
 
 #ifdef USE_SSLEAY
 
+#if (SSLEAY_VERSION_NUMBER >= 0x906000)
+  {
+    char sub[2];
+    if(SSLEAY_VERSION_NUMBER&0xff0) {
+      sub[0]=((SSLEAY_VERSION_NUMBER>>4)&0xff) + 'a' -1;
+    }
+    else
+      sub[0]=0;
+
+    sprintf(ptr, " (OpenSSL %lx.%lx.%lx%s)",
+            (SSLEAY_VERSION_NUMBER>>28)&0xf,
+            (SSLEAY_VERSION_NUMBER>>20)&0xff,
+            (SSLEAY_VERSION_NUMBER>>12)&0xff,
+            sub);
+  }
+
+#else
 #if (SSLEAY_VERSION_NUMBER >= 0x900000)
   sprintf(ptr, " (SSL %lx.%lx.%lx)",
           (SSLEAY_VERSION_NUMBER>>28)&0xff,
@@ -57,6 +74,7 @@ char *curl_version(void)
             (SSLEAY_VERSION_NUMBER>>8)&0xf,
             (SSLEAY_VERSION_NUMBER>>4)&0xf, sub);
   }
+#endif
 #endif
   ptr=strchr(ptr, '\0');
 #endif

packages/Makefile.am

@@ -1 +1,3 @@
 SUBDIRS = Win32 Linux
+
+EXTRA_DIST = README

perl/Curl_easy/Changes

@@ -0,0 +1,76 @@
+Revision history for Perl extension Curl::easy.
+Check out the file README for more info.
+
+1.1.5  Fri Apr 20 2001: - Cris Bailiff <c.bailiff@devsecure.com>
+    - Add latest CURLOPT_ and CURLINFO_ constants to the constants list
+
+1.1.4  Fri Apr 20 2001: - Cris Bailiff <c.bailiff@devsecure.com>
+    - Fix case where curl_slists such as 'HTTPHEADERS' need to
+      be re-set over persistant requests
+
+1.1.3  Wed Apr 18 2001: - Cris Bailiff <c.bailiff@devsecure.com>
+    - Change/shorten module function names: Curl::easy::curl_easy_setopt
+      becomes Curl::easy::setopt etc. This requires minor changes to existing
+      scripts....
+    - Added callback function support to pass arbitrary SV * (including
+	  FILE globs) from perl through libcurl to the perl callback.
+	- Make callbacks still work with existing scripts which use STDIO
+	- Initial support for libcurl 7.7.2 HEADERFUNCTION callback feature
+	- Minor API cleanups/changes in the callback function signatures
+	- Added Curl::easy::version function to return curl version string
+	- Callback documentation added in easy.pm
+    - More tests in test.pl
+
+1.1.2  Mon Apr 16 2001: - Georg Horn <horn@koblenz-net.de>
+    - Added support for callback functions. This is for the curl_easy_setopt()
+      options WRITEFUNCTION, READFUNCTION, PROGRESSFUNCTION and PASSWDFUNCTION.
+      Still missing, but not really neccessary: Passing a FILE * pointer,
+      that is passed in from libcurl, on to the perl callback function.
+    - Various cleanups, fixes and enhancements to easy.xs and test.pl.
+
+1.1.1  Thu Apr 12 2001:
+    - Made more options of curl_easy_setopt() work: Options that require
+      a list of curl_slist structs to be passed in, like CURLOPT_HTTPHEADER,
+      are now working by passing a perl array containing the list elements.
+      As always, look at the test script test.pl for an example.
+
+1.1.0  Wed Apr 11 2001:
+    - tested against libcurl 7.7
+    - Added new function Curl::easy::internal_setopt(). By calling
+      Curl::easy::internal_setopt(Curl::easy::USE_INTERNAL_VARS, 1);
+      the headers and content of the fetched page are no longer stored
+      into files (or written to stdout) but are stored into internal
+      Variables $Curl::easy::headers and $Curl::easy::content.
+
+1.0.2  Tue Oct 10 2000:
+    - runs with libcurl 7.4
+    - modified curl_easy_getinfo(). It now calls curl_getinfo() that has
+      been added to libcurl in version 7.4.
+
+1.0.1  Tue Oct 10 2000:
+    - Added some missing features of curl_easy_setopt():
+      - CURLOPT_ERRORBUFFER now works by passing the name of a perl
+        variable that shall be crated and the errormessage (if any)
+	be stored to.
+      - Passing filehandles (Options FILE, INFILE and WRITEHEADER) now works.
+    Have a look at test.pl to see how it works...
+
+    - Added a new function, curl_easy_getinfo(), that for now always
+      returns the number of bytes that where written to disk during the last
+      download. If the curl_easy_getinfo() function is included in libcurl,
+      (as promised by Daniel ;-)) i will turn this into just a call to this
+      function.
+
+1.0  Thu Oct 5 2000:
+    - first released version
+    - runs with libcurl 7.3
+    - some features of curl_easy_setopt() are still missing:
+      - passing function pointers doesn't work (options WRITEFUNCTION,
+	READFUNCTION and PROGRESSFUNCTION).
+      - passing FILE * pointers doesn't work (options FILE, INFILE and
+	WRITEHEADER).
+      - passing linked lists doesn't work (options HTTPHEADER and
+	HTTPPOST).
+      - setting the buffer where to store error messages in doesn't work
+	(option ERRORBUFFER).
+

perl/Curl_easy/MANIFEST

@@ -0,0 +1,7 @@
+Changes
+MANIFEST
+Makefile.PL
+README
+easy.pm
+easy.xs
+test.pl

perl/Curl_easy/Makefile.PL

@@ -0,0 +1,14 @@
+# Makefile.PL for Perl extension Curl::easy.
+# Check out the file README for more info.
+
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+    'NAME'	=> 'Curl::easy',
+    'VERSION_FROM' => 'easy.pm', # finds $VERSION
+    'LIBS'	=> ['-lcurl '],   # e.g., '-lm' 
+    'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
+    'INC'	=> '',     # e.g., '-I/usr/include/other' 
+    'clean'	=> {FILES => "head.out body.out"}
+);

perl/Curl_easy/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = Changes easy.pm easy.xs Makefile.PL MANIFEST README test.pl

perl/Curl_easy/README

@@ -0,0 +1,27 @@
+README for Perl extension Curl::easy.
+
+The perl module Curl::easy provides an interface to the cURL library "libcurl".
+See http://curl.haxx.se/ for more information on cURL and libcurl.
+
+This module requires libcurl and the corresponding headerfiles to be
+installed. You then may install this module via the usual way:
+
+    perl Makefile.PL
+    make
+    make test
+    make install
+
+The module provides the same functionality as libcurl provides to C programs,
+please refer to the documentation of libcurl. Some examples may be found in
+test.pl.
+
+This software is distributed AS IS, WITHOUT WARRANTY OF ANY KIND, either
+express or implied. Send praise, patches, money, beer and pizza to the author.
+Send complaints to /dev/null. ;-)
+
+The author of this software is Georg Horn <horn@koblenz-net.de>
+Parts of the callback support have been added by Cris Bailiff
+<c.bailiff@awayweb.com> and Forrest Cahoon <forrest.cahoon@merrillcorp.com>
+
+The latest version can be downloaded from http://koblenz-net.de/~horn/export/
+

perl/Curl_easy/easy.pm

@@ -0,0 +1,264 @@
+# Perl interface for libcurl. Check out the file README for more info.
+
+package Curl::easy;
+
+use strict;
+use Carp;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
+
+require Exporter;
+require DynaLoader;
+require AutoLoader;
+
+@ISA = qw(Exporter DynaLoader);
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+@EXPORT = qw(
+CURLOPT_AUTOREFERER
+CURLOPT_COOKIE
+CURLOPT_COOKIEFILE
+CURLOPT_CRLF
+CURLOPT_CUSTOMREQUEST
+CURLOPT_ERRORBUFFER
+CURLOPT_FAILONERROR
+CURLOPT_FILE
+CURLOPT_FOLLOWLOCATION
+CURLOPT_FTPAPPEND
+CURLOPT_FTPASCII
+CURLOPT_FTPLISTONLY
+CURLOPT_FTPPORT
+CURLOPT_HEADER
+CURLOPT_HEADERFUNCTION
+CURLOPT_HTTPHEADER
+CURLOPT_HTTPPOST
+CURLOPT_HTTPPROXYTUNNEL
+CURLOPT_HTTPREQUEST
+CURLOPT_INFILE
+CURLOPT_INFILESIZE
+CURLOPT_INTERFACE
+CURLOPT_KRB4LEVEL
+CURLOPT_LOW_SPEED_LIMIT
+CURLOPT_LOW_SPEED_TIME
+CURLOPT_MUTE
+CURLOPT_NETRC
+CURLOPT_NOBODY
+CURLOPT_NOPROGRESS
+CURLOPT_NOTHING
+CURLOPT_PASSWDDATA
+CURLOPT_PASSWDFUNCTION
+CURLOPT_PORT
+CURLOPT_POST
+CURLOPT_POSTFIELDS
+CURLOPT_POSTFIELDSIZE
+CURLOPT_POSTQUOTE
+CURLOPT_PROGRESSDATA
+CURLOPT_PROGRESSFUNCTION
+CURLOPT_PROXY
+CURLOPT_PROXYPORT
+CURLOPT_PROXYUSERPWD
+CURLOPT_PUT
+CURLOPT_QUOTE
+CURLOPT_RANGE
+CURLOPT_READFUNCTION
+CURLOPT_REFERER
+CURLOPT_RESUME_FROM
+CURLOPT_SSLCERT
+CURLOPT_SSLCERTPASSWD
+CURLOPT_SSLVERSION
+CURLOPT_STDERR
+CURLOPT_TIMECONDITION
+CURLOPT_TIMEOUT
+CURLOPT_TIMEVALUE
+CURLOPT_TRANSFERTEXT
+CURLOPT_UPLOAD
+CURLOPT_URL
+CURLOPT_USERAGENT
+CURLOPT_USERPWD
+CURLOPT_VERBOSE
+CURLOPT_WRITEFUNCTION
+CURLOPT_WRITEHEADER
+CURLOPT_MAXREDIRS
+CURLOPT_FILETIME
+CURLOPT_TELNETOPTIONS
+CURLOPT_MAXCONNECTS
+CURLOPT_CLOSEPOLICY
+CURLOPT_CLOSEFUNCTION
+CURLOPT_FRESH_CONNECT
+CURLOPT_FORBID_REUSE
+CURLOPT_RANDOM_FILE
+CURLOPT_EGD_SOCKET
+CURLOPT_CONNECTTIMEOUT
+
+CURLINFO_EFFECTIVE_URL
+CURLINFO_HTTP_CODE
+CURLINFO_TOTAL_TIME
+CURLINFO_NAMELOOKUP_TIME
+CURLINFO_CONNECT_TIME
+CURLINFO_PRETRANSFER_TIME
+CURLINFO_SIZE_UPLOAD
+CURLINFO_SIZE_DOWNLOAD
+CURLINFO_SPEED_DOWNLOAD
+CURLINFO_SPEED_UPLOAD
+CURLINFO_HEADER_SIZE
+CURLINFO_REQUEST_SIZE
+CURLINFO_SSL_VERIFYRESULT
+CURLINFO_FILETIME
+CURLINFO_CONTENT_LENGTH_DOWNLOAD
+CURLINFO_CONTENT_LENGTH_UPLOAD
+
+USE_INTERNAL_VARS
+);
+
+$VERSION = '1.1.5';
+
+$Curl::easy::headers = "";
+$Curl::easy::content = "";
+
+sub AUTOLOAD {
+    # This AUTOLOAD is used to 'autoload' constants from the constant()
+    # XS function.
+
+    (my $constname = $AUTOLOAD) =~ s/.*:://;
+    return constant($constname, 0);
+}
+
+bootstrap Curl::easy $VERSION;
+
+# Preloaded methods go here.
+
+# Autoload methods go after =cut, and are processed by the autosplit program.
+
+1;
+__END__
+# Below is the stub of documentation for your module. You better edit it!
+
+=head1 NAME
+
+Curl::easy - Perl extension for libcurl
+
+=head1 SYNOPSIS
+
+  use Curl::easy;
+ 
+  $curl = Curl::easy::init();
+  $CURLcode = Curl::easy::setopt($curl, CURLoption, Value);
+  $CURLcode = Curl::easy::perform($curl);
+  Curl::easy::cleanup($curl);
+ 
+=head1 DESCRIPTION
+ 
+This perl module provides an interface to the libcurl C library. See
+http://curl.haxx.se/ for more information on cURL and libcurl.
+ 
+=head1 FILES and CALLBACKS
+
+Curl::easy supports the various options of curl_easy_setopt which require either a FILE * or
+a callback function.
+
+The perl callback functions are handled through a C wrapper which takes care of converting
+from C to perl variables and back again. This wrapper simplifies some C arguments to make
+them behave in a more 'perl' like manner. In particular, the read and write callbacks do not
+look just like the 'fread' and 'fwrite' C functions - perl variables do not need separate length
+parameters, and perl functions can return a list of variables, instead of needing a pointer
+to modify. The details are described below.
+
+=head2 FILE handles (GLOBS)
+ 
+Curl options which take a FILE, such as CURLOPT_FILE, CURLOPT_WRITEHEADER, CURLOPT_INFILE
+can be passed a perl file handle:
+ 
+  open BODY,">body.out";
+  $CURLcode = Curl::easy::setopt($curl, CURLOPT_FILE, BODY);
+
+=head2 WRITE callback
+
+The CUROPT_WRITEFUNCTION option may be set which will cause libcurl to callback to
+the given subroutine:
+
+  sub chunk { my ($data,$pointer)=@_; ...; return length($data) }
+  $CURLcode = Curl::easy::setopt($curl, CURLOPT_WRITEFUNCTION, \&chunk );
+  $CURLcode = Curl::easy::setopt($curl, CURLOPT_FILE, );
+
+In this case, the subroutine will be passed whatever is defined by CURLOPT_FILE. This can be
+a ref to a scalar, or a GLOB or anything else you like.
+
+The callback function must return the number of bytes 'handled' ( length($data) ) or the transfer
+will abort. A transfer can be aborted by returning a 'length' of '-1'.
+
+The option CURLOPT_WRITEHEADER can be set to pass a different '$pointer' into the CURLOPT_WRITEFUNCTION 
+for header values. This lets you collect the headers and body separately:
+
+  my $headers="";
+  my $body="";
+  sub chunk { my ($data,$pointer)=@_; ${$pointer}.=$data; return length($data) }
+
+  $CURLcode = Curl::easy::setopt($curl, CURLOPT_WRITEFUNCTION, \&chunk );
+  $CURLcode = Curl::easy::setopt($curl, CURLOPT_WRITEHEADER, \$header );
+  $CURLcode = Curl::easy::setopt($curl, CURLOPT_FILE, \$body );
+
+If you have libcurl > 7.7.1, then you could instead set CURLOPT_HEADERFUNCTION to a different callback,
+and have the header collected that way.
+
+=head2 READ callback
+
+Curl::easy supports CURLOPT_READFUNCTION. This function should look something like this:
+
+    sub read_callback {
+        my ($maxlength,$pointer)=@_;
+
+		....
+
+        return $data;
+    }
+
+The subroutine must return an empty string "" at the end of the data. Note that this function
+isn't told how much data to provide - $maxlength is just the maximum size of the buffer
+provided by libcurl. If you are doing an HTTP POST or PUT for example, it is important that this
+function only returns as much data as the 'Content-Length' header specifies, followed by a
+an empty (0 length) buffer.
+
+=head2 PROGRESS callback
+
+Curl::easy supports CURLOPT_PROGRESSFUNCTION. This function should look something like this:
+
+    sub prog_callb
+    {
+        my ($clientp,$dltotal,$dlnow,$ultotal,$ulnow)=@_;
+		....
+        return 0;
+    }                        
+
+The function should return 0 normally, or -1 which will abort/cancel the transfer. $clientp is whatever
+value/scalar is set using the CURLOPT_PROGRESSDATA option.
+
+=head2 PASSWD callback
+
+Curl::easy supports CURLOPT_PASSWDFUNCTION. This function should look something like this:
+ 
+    sub passwd_callb
+    {
+		my ($clientp,$prompt,$buflen)=@_;
+		...
+    	return (0,$data);
+    }                    
+
+$clientp is whatever scalar is set using the CURLOPT_PASSWDDATA option.
+$prompt is a text string which can be used to prompt for a password.
+$buflen is the maximum accepted password reply.
+
+The function must return 0 (for 'OK') and the password data as a list. Return (-1,"") to
+indicate an error.
+
+=head1 AUTHOR
+ 
+Georg Horn <horn@koblenz-net.de>
+ 
+Additional callback,pod and tes work by Cris Bailiff <c.bailiff@devsecure.com>
+and Forrest Cahoon <forrest.cahoon@merrillcorp.com>
+
+=head1 SEE ALSO
+
+http://curl.haxx.se/
+
+=cut

perl/Curl_easy/easy.xs

@@ -0,0 +1,773 @@
+/* Perl interface for libcurl. Check out the file README for more info. */
+
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+
+#if (LIBCURL_VERSION_NUM<0x070702)
+#define CURLOPT_HEADERFUNCTION 20079
+#define header_callback_func write_callback_func
+#else
+#define header_callback_func writeheader_callback_func
+#endif
+
+/* Lists that can be set via curl_easy_setopt() */
+
+static struct curl_slist *httpheader = NULL, *quote = NULL, *postquote = NULL;
+
+
+/* Buffer and varname for option CURLOPT_ERRORBUFFER */
+
+static char errbuf[CURL_ERROR_SIZE];
+static char *errbufvarname = NULL;
+
+
+/* Callback functions */
+
+static SV *read_callback = NULL, *write_callback = NULL,
+          *progress_callback = NULL, *passwd_callback = NULL,
+	  *header_callback = NULL; 
+	  /* *closepolicy_callback = NULL; */
+
+
+/* For storing the content */
+
+static char *contbuf = NULL, *bufptr = NULL;
+static int bufsize = 32768, contlen = 0;
+
+
+/* Internal options for this perl module */
+
+#define USE_INTERNAL_VARS 0x01
+
+static int internal_options = 0;
+
+
+/* Setup these global vars */
+
+static void init_globals(void)
+{
+    if (httpheader) curl_slist_free_all(httpheader);
+    if (quote) curl_slist_free_all(quote);
+    if (postquote) curl_slist_free_all(postquote);
+    httpheader = quote = postquote = NULL;
+    if (errbufvarname) free(errbufvarname);
+    errbufvarname = NULL;
+    if (contbuf == NULL) {
+	contbuf = malloc(bufsize + 1);
+    }
+    bufptr = contbuf;
+    *bufptr = '\0';
+    contlen = 0;
+    internal_options = 0;
+}
+
+
+/* Register a callback function */
+
+static void register_callback(SV **callback, SV *function)
+{
+    if (*callback == NULL) {
+	/* First time, create new SV */
+	*callback = newSVsv(function);
+    } else {
+	/* Been there, done that. Just overwrite the SV */
+	SvSetSV(*callback, function);
+    }
+}
+
+/* generic fwrite callback, which decides which callback to call */
+static size_t
+fwrite_wrapper (const void *ptr,
+		size_t size,
+		size_t nmemb,
+		void *stream,
+		void *call_function)
+{
+    dSP;
+    int count, status;
+    SV *sv;
+
+    if (call_function) {
+	/* then we are doing a callback to perl */
+
+	ENTER;
+	SAVETMPS;
+
+	PUSHMARK(SP);
+
+	if (stream == stdout) {
+	    sv = newSViv(0);	/* FIXME: should cast stdout to GLOB somehow? */
+	} else {		/* its already an SV */
+	    sv = stream;
+	}
+
+	if (ptr != NULL) {
+	    XPUSHs(sv_2mortal(newSVpvn(ptr, size * nmemb)));
+	} else {
+	    XPUSHs(sv_2mortal(newSVpv("", 0)));
+	}
+	XPUSHs(sv_2mortal(newSVsv(sv)));	/* CURLOPT_FILE SV* */
+	PUTBACK;
+
+	count = perl_call_sv((SV *) call_function, G_SCALAR);
+
+	SPAGAIN;
+	if (count != 1)
+	    croak("Big trouble, perl_call_sv(write_callback) didn't return status\n");
+
+	status = POPi;
+
+	PUTBACK;
+
+	FREETMPS;
+	LEAVE;
+	return status;
+
+    } else {
+	/* default to a normal 'fwrite' */
+	/* stream could be a FILE * or an SV * */
+	FILE *f;
+
+	if (stream == stdout) {	/* the only possible FILE ? Think so */
+	    f = stream;
+	} else {		/* its a GLOB */
+	    f = IoIFP(sv_2io(stream));	/* may barf if not a GLOB */
+	}
+
+	return fwrite(ptr, size, nmemb, f);
+    }
+}
+
+/* Write callback for calling a perl callback */
+size_t
+write_callback_func( const void *ptr, size_t size,
+                                size_t nmemb, void *stream)
+{
+    return fwrite_wrapper(ptr,size,nmemb,stream,
+        write_callback);
+}
+
+/* header callback for calling a perl callback */
+size_t
+writeheader_callback_func( const void *ptr, size_t size,
+                              size_t nmemb, void *stream)
+{
+    return fwrite_wrapper(ptr,size,nmemb,stream,
+        header_callback);
+}
+
+size_t
+read_callback_func( void *ptr, size_t size,
+                    size_t nmemb, void *stream)
+{
+    dSP ;
+
+    int count;
+    SV *sv;
+    STRLEN len;
+    size_t maxlen,mylen;
+    char *p;
+
+    maxlen = size*nmemb;
+
+    if (read_callback) {
+        /* we are doing a callback to perl */
+
+        ENTER ;
+        SAVETMPS ;
+ 
+        PUSHMARK(SP) ;
+	
+        if (stream == stdin) {
+            sv = newSViv(0); /* should cast stdin to GLOB somehow? */
+        } else { /* its an SV */
+            sv = stream;
+        }
+	
+        XPUSHs(sv_2mortal(newSViv(maxlen))); /* send how many bytes please */
+        XPUSHs(sv_2mortal(newSVsv(sv))); /* CURLOPT_INFILE SV*  */
+        PUTBACK ;
+
+        count = perl_call_sv(read_callback, G_SCALAR);
+	 
+        SPAGAIN;
+        if (count != 1)
+            croak("Big trouble, perl_call_sv(read_callback) didn't return data\n");
+
+        sv = POPs;
+        p = SvPV(sv,len);
+
+        /* only allowed to return the number of bytes asked for */
+        mylen = len<maxlen ? len : maxlen;
+        memcpy(ptr,p,(size_t)mylen);
+        PUTBACK ;
+ 
+        FREETMPS ;
+        LEAVE ;
+        return (size_t) (mylen/size);
+    } else {
+       /* default to a normal 'fread' */
+       /* stream could be a FILE * or an SV * */
+       FILE *f;
+
+       if (stream == stdin) { /* the only possible FILE ? Think so*/
+           f = stream;
+       } else { /* its a GLOB */
+           f = IoIFP(sv_2io(stream)); /* may barf if not a GLOB */
+       }
+
+       return fread(ptr,size,nmemb,f);
+    }
+}
+
+/* Porgress callback for calling a perl callback */
+
+static int progress_callback_func(void *clientp, size_t dltotal, size_t dlnow,
+    size_t ultotal, size_t ulnow)
+{
+    dSP;
+    int count;
+
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(sp);
+    if (clientp != NULL) {
+	XPUSHs(sv_2mortal(newSVpv(clientp, 0)));
+    } else {
+	XPUSHs(sv_2mortal(newSVpv("", 0)));
+    }
+    XPUSHs(sv_2mortal(newSViv(dltotal)));
+    XPUSHs(sv_2mortal(newSViv(dlnow)));
+    XPUSHs(sv_2mortal(newSViv(ultotal)));
+    XPUSHs(sv_2mortal(newSViv(ulnow)));
+    PUTBACK;
+    count = perl_call_sv(progress_callback, G_SCALAR);
+    SPAGAIN;
+    if (count != 1)
+	croak("Big trouble, perl_call_sv(progress_callback) didn't return 1\n");
+    count = POPi;
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    return count;
+}
+
+
+/* Password callback for calling a perl callback */
+
+static int passwd_callback_func(void *clientp, char *prompt, char *buffer,
+    int buflen)
+{
+    dSP;
+    int count;
+    SV *sv;
+    STRLEN len;
+    size_t mylen;
+    char *p;            
+
+    ENTER;
+    SAVETMPS;
+    PUSHMARK(sp);
+    if (clientp != NULL) {
+        XPUSHs(sv_2mortal(newSVsv(clientp)));
+    } else {
+        XPUSHs(sv_2mortal(newSVpv("", 0)));
+    }
+    XPUSHs(sv_2mortal(newSVpv(prompt, 0)));
+    XPUSHs(sv_2mortal(newSViv(buflen)));
+    PUTBACK;
+    count = perl_call_sv(passwd_callback, G_ARRAY);
+    SPAGAIN;
+    if (count != 2)
+	croak("Big trouble, perl_call_sv(passwd_callback) didn't return status + data\n");
+
+    sv = POPs;
+    count = POPi;
+
+    p = SvPV(sv,len);
+ 
+    /* only allowed to return the number of bytes asked for */
+    mylen = len<(buflen-1) ? len : (buflen-1);
+    memcpy(buffer,p,mylen);
+    buffer[buflen]=0; /* ensure C string terminates */
+
+    PUTBACK;
+    FREETMPS;
+    LEAVE;
+    return count;
+}
+
+
+#if 0
+/* awaiting closepolicy prototype */
+int 
+closepolicy_callback_func(void *clientp)
+{
+   dSP;
+   int argc, status;
+   SV *pl_status;
+
+   ENTER;
+   SAVETMPS;
+
+   PUSHMARK(SP);
+   PUTBACK;
+
+   argc = perl_call_sv(closepolicy_callback, G_SCALAR);
+   SPAGAIN;
+
+   if (argc != 1) {
+      croak("Unexpected number of arguments returned from closefunction callback\n");
+   }
+   pl_status = POPs;
+   status = SvTRUE(pl_status) ? 0 : 1;
+
+   PUTBACK;
+   FREETMPS;
+   LEAVE;
+
+   return status;
+}
+#endif
+
+
+
+/* Internal write callback. Only used if USE_INTERNAL_VARS was specified */
+
+static size_t internal_write_callback(char *data, size_t size, size_t num,
+    FILE *fp)
+{
+    int i;
+
+    size *= num;
+    if ((contlen + size) >= bufsize) {
+	bufsize *= 2;
+	contbuf = realloc(contbuf, bufsize + 1);
+	bufptr = contbuf + contlen;
+    }
+    contlen += size;
+    for (i = 0; i < size; i++) {
+	*bufptr++ = *data++;
+    }
+    *bufptr = '\0';
+    return size;
+}
+
+
+static int
+constant(char *name, int arg)
+{
+    errno = 0;
+    if (strncmp(name, "CURLINFO_", 9) == 0) {
+	name += 9;
+	switch (*name) {
+	case 'A':
+	case 'B':
+	case 'C':
+	    if (strEQ(name, "CONNECT_TIME")) return CURLINFO_CONNECT_TIME;
+	    if (strEQ(name, "CONTENT_LENGTH_DOWNLOAD")) return CURLINFO_CONTENT_LENGTH_DOWNLOAD;
+	    if (strEQ(name, "CONTENT_LENGTH_UPLOAD")) return CURLINFO_CONTENT_LENGTH_UPLOAD;
+	    break;
+	case 'D':
+	case 'E':
+	    if (strEQ(name, "EFFECTIVE_URL")) return CURLINFO_EFFECTIVE_URL;
+	    break;
+	case 'F':
+	    if (strEQ(name, "FILETIME")) return CURLINFO_FILETIME;
+	    break;
+	case 'G':
+	case 'H':
+	    if (strEQ(name, "HEADER_SIZE")) return CURLINFO_HEADER_SIZE;
+	    if (strEQ(name, "HTTP_CODE")) return CURLINFO_HTTP_CODE;
+	    break;
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	    if (strEQ(name, "NAMELOOKUP_TIME")) return CURLINFO_NAMELOOKUP_TIME;
+	    break;
+	case 'O':
+	case 'P':
+	    if (strEQ(name, "PRETRANSFER_TIME")) return CURLINFO_PRETRANSFER_TIME;
+	    break;
+	case 'Q':
+	case 'R':
+	    if (strEQ(name, "REQUEST_SIZE")) return CURLINFO_REQUEST_SIZE;
+	    break;
+	case 'S':
+	    if (strEQ(name, "SSL_VERIFYRESULT")) return CURLINFO_SSL_VERIFYRESULT;
+	    break;
+	case 'T':
+	    if (strEQ(name, "SIZE_DOWNLOAD")) return CURLINFO_SIZE_DOWNLOAD;
+	    if (strEQ(name, "SIZE_UPLOAD")) return CURLINFO_SIZE_UPLOAD;
+	    if (strEQ(name, "SPEED_DOWNLOAD")) return CURLINFO_SPEED_DOWNLOAD;
+	    if (strEQ(name, "SPEED_UPLOAD")) return CURLINFO_SPEED_UPLOAD;
+	    if (strEQ(name, "TOTAL_TIME")) return CURLINFO_TOTAL_TIME;
+	    break;
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	    break;
+	}
+    }
+    if (strncmp(name, "CURLOPT_", 8) == 0) {
+	name += 8;
+	switch (*name) {
+	case 'A':
+	case 'B':
+	    if (strEQ(name, "AUTOREFERER")) return CURLOPT_AUTOREFERER;
+	    break;
+	case 'C':
+	    if (strEQ(name, "CONNECTTIMEOUT")) return CURLOPT_CONNECTTIMEOUT;
+	    if (strEQ(name, "COOKIE")) return CURLOPT_COOKIE;
+	    if (strEQ(name, "COOKIEFILE")) return CURLOPT_COOKIEFILE;
+	    if (strEQ(name, "CLOSEFUNCTION")) return CURLOPT_CLOSEFUNCTION;
+	    if (strEQ(name, "CLOSEPOLICY")) return CURLOPT_CLOSEPOLICY;
+	    if (strEQ(name, "CRLF")) return CURLOPT_CRLF;
+	    if (strEQ(name, "CUSTOMREQUEST")) return CURLOPT_CUSTOMREQUEST;
+	    break;
+	case 'D':
+	case 'E':
+	    if (strEQ(name, "EGDSOCKET")) return CURLOPT_EGDSOCKET;
+	    if (strEQ(name, "ERRORBUFFER")) return CURLOPT_ERRORBUFFER;
+            break;
+	case 'F':
+	    if (strEQ(name, "FAILONERROR")) return CURLOPT_FAILONERROR;
+	    if (strEQ(name, "FILE")) return CURLOPT_FILE;
+	    if (strEQ(name, "FILETIME")) return CURLOPT_FILETIME;
+	    if (strEQ(name, "FOLLOWLOCATION")) return CURLOPT_FOLLOWLOCATION;
+	    if (strEQ(name, "FORBID_REUSE")) return CURLOPT_FORBID_REUSE;
+	    if (strEQ(name, "FTPAPPEND")) return CURLOPT_FTPAPPEND;
+	    if (strEQ(name, "FTPASCII")) return CURLOPT_FTPASCII;
+	    if (strEQ(name, "FTPLISTONLY")) return CURLOPT_FTPLISTONLY;
+	    if (strEQ(name, "FTPPORT")) return CURLOPT_FTPPORT;
+	    if (strEQ(name, "FRESH_CONNECT")) return CURLOPT_FRESH_CONNECT;
+	    break;
+	case 'G':
+	case 'H':
+	    if (strEQ(name, "HEADER")) return CURLOPT_HEADER;
+            if (strEQ(name, "HEADERFUNCTION")) return CURLOPT_HEADERFUNCTION;
+	    if (strEQ(name, "HTTPHEADER")) return CURLOPT_HTTPHEADER;
+	    if (strEQ(name, "HTTPPOST")) return CURLOPT_HTTPPOST;
+	    if (strEQ(name, "HTTPPROXYTUNNEL")) return CURLOPT_HTTPPROXYTUNNEL;
+	    if (strEQ(name, "HTTPREQUEST")) return CURLOPT_HTTPREQUEST;
+	    break;
+	case 'I':
+	case 'J':
+	    if (strEQ(name, "INFILE")) return CURLOPT_INFILE;
+	    if (strEQ(name, "INFILESIZE")) return CURLOPT_INFILESIZE;
+	    if (strEQ(name, "INTERFACE")) return CURLOPT_INTERFACE;
+	    break;
+	case 'K':
+	case 'L':
+	    if (strEQ(name, "KRB4LEVEL")) return CURLOPT_KRB4LEVEL;
+	    if (strEQ(name, "LOW_SPEED_LIMIT")) return CURLOPT_LOW_SPEED_LIMIT;
+	    if (strEQ(name, "LOW_SPEED_TIME")) return CURLOPT_LOW_SPEED_TIME;
+	    break;
+	case 'M':
+	    if (strEQ(name, "MAXCONNECTS")) return CURLOPT_MAXCONNECTS;
+	    if (strEQ(name, "MAXREDIRS")) return CURLOPT_MAXREDIRS;
+	    break;
+	case 'N':
+	    if (strEQ(name, "MUTE")) return CURLOPT_MUTE;
+	    if (strEQ(name, "NETRC")) return CURLOPT_NETRC;
+	    if (strEQ(name, "NOBODY")) return CURLOPT_NOBODY;
+	    if (strEQ(name, "NOPROGRESS")) return CURLOPT_NOPROGRESS;
+	    if (strEQ(name, "NOTHING")) return CURLOPT_NOTHING;
+	    break;
+	case 'O':
+	case 'P':
+	    if (strEQ(name, "PASSWDDATA")) return CURLOPT_PASSWDDATA;
+	    if (strEQ(name, "PASSWDFUNCTION")) return CURLOPT_PASSWDFUNCTION;
+	    if (strEQ(name, "PORT")) return CURLOPT_PORT;
+	    if (strEQ(name, "POST")) return CURLOPT_POST;
+	    if (strEQ(name, "POSTFIELDS")) return CURLOPT_POSTFIELDS;
+	    if (strEQ(name, "POSTFIELDSIZE")) return CURLOPT_POSTFIELDSIZE;
+	    if (strEQ(name, "POSTQUOTE")) return CURLOPT_POSTQUOTE;
+	    if (strEQ(name, "PROGRESSDATA")) return CURLOPT_PROGRESSDATA;
+	    if (strEQ(name, "PROGRESSFUNCTION")) return CURLOPT_PROGRESSFUNCTION;
+	    if (strEQ(name, "PROXY")) return CURLOPT_PROXY;
+	    if (strEQ(name, "PROXYPORT")) return CURLOPT_PROXYPORT;
+	    if (strEQ(name, "PROXYUSERPWD")) return CURLOPT_PROXYUSERPWD;
+	    if (strEQ(name, "PUT")) return CURLOPT_PUT;
+	    break;
+	case 'Q':
+	    if (strEQ(name, "QUOTE")) return CURLOPT_QUOTE;
+            break;
+ 	case 'R':
+	    if (strEQ(name, "RANDOM_FILE")) return CURLOPT_RANDOM_FILE;
+	    if (strEQ(name, "RANGE")) return CURLOPT_RANGE;
+	    if (strEQ(name, "READFUNCTION")) return CURLOPT_READFUNCTION;
+	    if (strEQ(name, "REFERER")) return CURLOPT_REFERER;
+	    if (strEQ(name, "RESUME_FROM")) return CURLOPT_RESUME_FROM;
+	    break;
+	case 'S':
+	    if (strEQ(name, "SSLCERT")) return CURLOPT_SSLCERT;
+	    if (strEQ(name, "SSLCERTPASSWD")) return CURLOPT_SSLCERTPASSWD;
+	    if (strEQ(name, "SSLVERSION")) return CURLOPT_SSLVERSION;
+	    if (strEQ(name, "STDERR")) return CURLOPT_STDERR;
+            break;
+	case 'T':
+	    if (strEQ(name, "TELNETOPTIONS")) return CURLOPT_TELNETOPTIONS;
+	    if (strEQ(name, "TIMECONDITION")) return CURLOPT_TIMECONDITION;
+	    if (strEQ(name, "TIMEOUT")) return CURLOPT_TIMEOUT;
+	    if (strEQ(name, "TIMEVALUE")) return CURLOPT_TIMEVALUE;
+	    if (strEQ(name, "TRANSFERTEXT")) return CURLOPT_TRANSFERTEXT;
+	    break;
+	case 'U':
+	case 'V':
+	    if (strEQ(name, "UPLOAD")) return CURLOPT_UPLOAD;
+	    if (strEQ(name, "URL")) return CURLOPT_URL;
+	    if (strEQ(name, "USERAGENT")) return CURLOPT_USERAGENT;
+	    if (strEQ(name, "USERPWD")) return CURLOPT_USERPWD;
+	    if (strEQ(name, "VERBOSE")) return CURLOPT_VERBOSE;
+	    break;
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	    if (strEQ(name, "WRITEFUNCTION")) return CURLOPT_WRITEFUNCTION;
+	    if (strEQ(name, "WRITEHEADER")) return CURLOPT_WRITEHEADER;
+	    if (strEQ(name, "WRITEINFO")) return CURLOPT_WRITEINFO;
+	    break;
+	}
+    }
+    if (strEQ(name, "USE_INTERNAL_VARS")) return USE_INTERNAL_VARS;
+    errno = EINVAL;
+    return 0;
+}
+
+
+MODULE = Curl::easy		PACKAGE = Curl::easy		PREFIX = curl_easy_
+
+int
+constant(name,arg)
+    char * name
+    int arg
+
+
+void *
+curl_easy_init()
+CODE:
+    init_globals();
+    RETVAL = curl_easy_init();
+    curl_easy_setopt(RETVAL, CURLOPT_HEADERFUNCTION, header_callback_func);
+    curl_easy_setopt(RETVAL, CURLOPT_WRITEFUNCTION, write_callback_func);
+OUTPUT:
+    RETVAL
+
+char *
+curl_easy_version()
+CODE:
+	RETVAL=curl_version();
+OUTPUT:
+	RETVAL
+
+int
+curl_easy_setopt(curl, option, value)
+void * curl
+int option
+SV * value
+CODE:
+    if (option < CURLOPTTYPE_OBJECTPOINT) {
+	/* This is an option specifying an integer value: */
+	RETVAL = curl_easy_setopt(curl, option, (long)SvIV(value));
+    } else if (option == CURLOPT_FILE || option == CURLOPT_INFILE ||
+	    option == CURLOPT_WRITEHEADER || option == CURLOPT_PROGRESSDATA ||
+	    option == CURLOPT_PASSWDDATA) {
+	/* This is an option specifying an SV * value: */
+	RETVAL = curl_easy_setopt(curl, option, newSVsv(ST(2)));
+    } else if (option == CURLOPT_ERRORBUFFER) {
+	/* Pass in variable name for storing error messages... */
+	RETVAL = curl_easy_setopt(curl, option, errbuf);
+	if (errbufvarname) free(errbufvarname);
+	errbufvarname = strdup((char *)SvPV(value, PL_na));
+    } else if (option == CURLOPT_WRITEFUNCTION || option ==
+	    CURLOPT_READFUNCTION || option == CURLOPT_PROGRESSFUNCTION ||
+	    option == CURLOPT_PASSWDFUNCTION || option == CURLOPT_HEADERFUNCTION) {
+	/* This is an option specifying a callback function */
+	switch (option) {
+	case CURLOPT_WRITEFUNCTION:
+	    register_callback(&write_callback, value);
+	    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback_func);
+	    break;
+	case CURLOPT_READFUNCTION:
+	    register_callback(&read_callback, value);
+	    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback_func);
+	    break;
+        case CURLOPT_HEADERFUNCTION:
+            register_callback(&header_callback, value);
+	    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_callback_func);	
+	case CURLOPT_PROGRESSFUNCTION:
+	    register_callback(&progress_callback, value);
+	    curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback_func);
+	    break;
+	case CURLOPT_PASSWDFUNCTION:
+	    register_callback(&passwd_callback, value);
+	    curl_easy_setopt(curl, CURLOPT_PASSWDFUNCTION, passwd_callback_func);
+	    break;
+        /* awaiting a prototype for the closepolicy function callback 
+        case CURLOPT_CLOSEFUNCTION:
+            register_callback(&closepolicy_callback, value);
+            curl_easy_setopt(curl, CURLOPT_CLOSEFUNCTION, closepolicy_callback_func);
+            break;
+        */
+	}
+	RETVAL = -1;
+    } else if (option == CURLOPT_HTTPHEADER || option == CURLOPT_QUOTE ||
+	    option == CURLOPT_POSTQUOTE) {
+	/* This is an option specifying a list of curl_slist structs: */
+	AV *array = (AV *)SvRV(value);
+	struct curl_slist **slist = NULL;
+	/* We have to find out which list to use... */
+	switch (option) {
+	case CURLOPT_HTTPHEADER:
+	    slist = &httpheader; break;
+	case CURLOPT_QUOTE:
+	    slist = &quote; break;
+	case CURLOPT_POSTQUOTE:
+	    slist = &postquote; break;
+	}
+        /* free any previous list */
+        if (*slist) {
+            curl_slist_free_all(*slist);
+            *slist=NULL;
+        }                                                                       
+	/* ...store the values into it... */
+	for (;;) {
+	    SV *sv = av_shift(array);
+	    int len = 0;
+	    char *str = SvPV(sv, len);
+	    if (len == 0) break;
+	    *slist = curl_slist_append(*slist, str);
+	}
+	/* ...and pass the list into curl_easy_setopt() */
+	RETVAL = curl_easy_setopt(curl, option, *slist);
+    } else {
+	/* This is an option specifying a char * value: */
+	RETVAL = curl_easy_setopt(curl, option, SvPV(value, PL_na));
+    }
+OUTPUT:
+    RETVAL
+
+
+int
+internal_setopt(option, value)
+int option
+int value
+CODE:
+    if (value == 1) {
+	internal_options |= option;
+    } else {
+	internal_options &= !option;
+    }
+    RETVAL = 0;
+OUTPUT:
+    RETVAL
+
+
+int
+curl_easy_perform(curl)
+void * curl 
+CODE:
+    if (internal_options & USE_INTERNAL_VARS) {
+	/* Use internal callback which just stores the content into a buffer. */
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, internal_write_callback);
+	curl_easy_setopt(curl, CURLOPT_HEADER, 1);
+    }
+    RETVAL = curl_easy_perform(curl);
+    if (RETVAL && errbufvarname) {
+	/* If an error occurred and a varname for error messages has been
+	   specified, store the error message. */
+	SV *sv = perl_get_sv(errbufvarname, TRUE | GV_ADDMULTI);
+	sv_setpv(sv, errbuf);
+    }
+    if (!RETVAL && (internal_options & USE_INTERNAL_VARS)) {
+	/* No error and internal variable for the content are to be used:
+	   Split the data into headers and content and store them into
+	   perl variables. */
+	SV *head_sv = perl_get_sv("Curl::easy::headers", TRUE | GV_ADDMULTI);
+	SV *cont_sv = perl_get_sv("Curl::easy::content", TRUE | GV_ADDMULTI);
+	char *p = contbuf;
+	int nl = 0, found = 0;
+	while (p < bufptr) {
+	    if (nl && (*p == '\n' || *p == '\r')) {
+		/* found empty line, end of headers */
+		*p++ = '\0';
+		sv_setpv(head_sv, contbuf);
+		while (*p == '\n' || *p == '\r') {
+		    p++;
+		}
+		sv_setpv(cont_sv, p);
+		found = 1;
+		break;
+	    }
+	    nl = (*p == '\n');
+	    p++;
+	}
+	if (!found) {
+	    sv_setpv(head_sv, "");
+	    sv_setpv(cont_sv, contbuf);
+	}
+    }
+OUTPUT:
+    RETVAL
+
+
+int
+curl_easy_getinfo(curl, option, value)
+void * curl
+int option
+double value
+CODE:
+#ifdef __GNUC__
+    /* a(void) warnig about unnused variable */
+    (void) value;
+#endif
+    switch (option & CURLINFO_TYPEMASK) {
+	case CURLINFO_STRING: {
+	    char * value = (char *)SvPV(ST(2), PL_na);
+	    RETVAL = curl_easy_getinfo(curl, option, &value);
+	    sv_setpv(ST(2), value);
+	    break;
+	}
+	case CURLINFO_LONG: {
+	    long value = (long)SvIV(ST(2));
+	    RETVAL = curl_easy_getinfo(curl, option, &value);
+	    sv_setiv(ST(2), value);
+	    break;
+	}
+	case CURLINFO_DOUBLE: {
+	    double value = (double)SvNV(ST(2));
+	    RETVAL = curl_easy_getinfo(curl, option, &value);
+	    sv_setnv(ST(2), value);
+	    break;
+	}
+	default: {
+	    RETVAL = CURLE_BAD_FUNCTION_ARGUMENT;
+	    break;
+	}
+    }
+OUTPUT:
+    RETVAL
+
+
+int
+curl_easy_cleanup(curl)
+void * curl 
+CODE:
+    curl_easy_cleanup(curl);
+    init_globals();
+    RETVAL = 0;
+OUTPUT:
+    RETVAL
+

perl/Curl_easy/test.pl

@@ -0,0 +1,315 @@
+# Test script for Perl extension Curl::easy.
+# Check out the file README for more info.
+
+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl test.pl'
+
+######################### We start with some black magic to print on failure.
+
+# Change 1..1 below to 1..last_test_to_print .
+# (It may become useful if the test is moved to ./t subdirectory.)
+use Benchmark;
+use strict;
+
+BEGIN { $| = 1; print "1..13\n"; }
+END {print "not ok 1\n" unless $::loaded;}
+use Curl::easy;
+
+$::loaded = 1;
+print "ok 1\n";
+
+######################### End of black magic.
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+
+print "Testing curl version ",&Curl::easy::version(),"\n";
+
+# Read URL to get
+my $defurl = "http://localhost/cgi-bin/printenv";
+my $url = "";
+print "Please enter an URL to fetch [$defurl]: ";
+$url = <STDIN>;
+if ($url =~ /^\s*\n/) {
+    $url = $defurl;
+}
+
+# Init the curl session
+my $curl;
+if (($curl = Curl::easy::init()) != 0) {
+    print "ok 2\n";
+} else {
+    print "ko 2\n";
+}
+
+
+# No progress meter please
+# !! Need this on for all tests, as once disabled, can't re-enable it...
+#Curl::easy::setopt($curl, CURLOPT_NOPROGRESS, 1);
+
+# Shut up completely
+Curl::easy::setopt($curl, CURLOPT_MUTE, 1);
+
+# Follow location headers
+Curl::easy::setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
+
+# Set timeout
+Curl::easy::setopt($curl, CURLOPT_TIMEOUT, 30);
+
+# Set file where to read cookies from
+Curl::easy::setopt($curl, CURLOPT_COOKIEFILE, "cookies");
+
+# Set file where to store the header
+open HEAD, ">head.out";
+Curl::easy::setopt($curl, CURLOPT_WRITEHEADER, *HEAD);
+print "ok 3\n";
+
+# Set file where to store the body
+# Send body to stdout - test difference between FILE * and SV *
+#open BODY, ">body.out";
+#Curl::easy::setopt($curl, CURLOPT_FILE,*BODY);
+print "ok 4\n";
+
+# Add some additional headers to the http-request:
+my @myheaders;
+$myheaders[0] = "Server: www";
+$myheaders[1] = "User-Agent: Perl interface for libcURL";
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_HTTPHEADER, \@myheaders);
+                                                                        
+# Store error messages in variable $errbuf
+# NOTE: The name of the variable is passed as a string!
+# setopt() creates a perl variable with that name, and
+# perform() stores the errormessage into it if an error occurs.
+ 
+Curl::easy::setopt($curl, CURLOPT_ERRORBUFFER, "errbuf");
+Curl::easy::setopt($curl, CURLOPT_URL, $url);
+print "ok 5\n";
+
+my $bytes;
+my $realurl;
+my $httpcode;
+my $errbuf;
+
+# Go get it
+if (Curl::easy::perform($curl) == 0) {
+    Curl::easy::getinfo($curl, CURLINFO_SIZE_DOWNLOAD, $bytes);
+    print "ok 6: $bytes bytes read\n";
+    Curl::easy::getinfo($curl, CURLINFO_EFFECTIVE_URL, $realurl);
+    Curl::easy::getinfo($curl, CURLINFO_HTTP_CODE, $httpcode);
+    print "effective fetched url (http code: $httpcode) was: $url\n";
+} else {
+   # We can acces the error message in $errbuf here
+    print "not ok 6: '$errbuf'\n";
+	die "basic url access failed";
+}
+
+# cleanup
+#close HEAD;
+# test here - BODY is still expected to be the output
+# Curl-easy-1.0.2.pm core dumps if we 'perform' with a closed output FD...
+#close BODY;
+#exit;
+#
+# The header callback will only be called if your libcurl has the
+# CURLOPT_HEADERFUNCTION supported, otherwise your headers
+# go to CURLOPT_WRITEFUNCTION instead...
+#
+
+my $header_called=0;
+sub header_callback { print "header callback called\n"; $header_called=1; return length($_[0])};
+
+# test for sub reference and head callback
+Curl::easy::setopt($curl, CURLOPT_HEADERFUNCTION, \&header_callback);
+print "ok 7\n"; # so far so good
+
+if (Curl::easy::perform($curl) != 0) {
+	print "not ";
+};
+print "ok 8\n";
+
+print "next test will fail on libcurl < 7.7.2\n";
+print "not " if (!$header_called); # ok if you have a libcurl <7.7.2
+print "ok 9\n";
+
+my $body_called=0;
+sub body_callback {
+	my ($chunk,$handle)=@_;
+	print "body callback called with ",length($chunk)," bytes\n";
+	print "data=$chunk\n";
+	$body_called++;
+	return length($chunk); # OK
+}
+
+# test for ref to sub and body callback
+my $body_ref=\&body_callback;
+Curl::easy::setopt($curl, CURLOPT_WRITEFUNCTION, $body_ref);
+
+if (Curl::easy::perform($curl) != 0) {
+	print "not ";
+};
+print "ok 10\n";
+
+print "not " if (!$body_called);
+print "ok 11\n";
+
+my $body_abort_called=0;
+sub body_abort_callback {
+	my ($chunk,$sv)=@_;
+	print "body abort callback called with ",length($chunk)," bytes\n";
+	$body_abort_called++;
+	return  -1; # signal a failure
+}
+
+# test we can abort a request mid-way
+my $body_abort_ref=\&body_abort_callback;
+Curl::easy::setopt($curl, CURLOPT_WRITEFUNCTION, $body_abort_ref);
+
+if (Curl::easy::perform($curl) == 0) { # reverse test - this should have failed
+	print "not ";
+};
+print "ok 12\n";
+
+print "not " if (!$body_abort_called); # should have been called
+print "ok 13\n";
+
+# reset to a working 'write' function for next tests
+Curl::easy::setopt($curl,CURLOPT_WRITEFUNCTION, sub { return length($_[0])} );
+
+# inline progress function
+# tests for inline subs and progress callback
+# - progress callback must return 'true' on each call.
+ 
+my $progress_called=0;
+sub prog_callb
+{
+    my ($clientp,$dltotal,$dlnow,$ultotal,$ulnow)=@_;
+    print "\nperl progress_callback has been called!\n";
+    print "clientp: $clientp, dltotal: $dltotal, dlnow: $dlnow, ultotal: $ultotal, ";
+    print "ulnow: $ulnow\n";
+	$progress_called++;
+    return 0;
+}                        
+
+Curl::easy::setopt($curl, CURLOPT_PROGRESSFUNCTION, \&prog_callb);
+
+# Turn progress meter back on - this doesn't work - once its off, its off.
+Curl::easy::setopt($curl, CURLOPT_NOPROGRESS, 0);
+
+if (Curl::easy::perform($curl) != 0) {
+	print "not ";
+};
+print "ok 14\n";
+
+print "not " if (!$progress_called);
+print "ok 15\n";
+
+my $read_max=10;
+
+sub read_callb
+{
+    my ($maxlen,$sv)=@_;
+    print "\nperl read_callback has been called!\n";
+    print "max data size: $maxlen\n";
+	print "(upload needs $read_max bytes)\n";
+    print "context: ".$sv."\n";
+	if ($read_max > 0) {
+		print "\nEnter max ", $read_max, " characters to be uploaded.\n";
+		my $data = <STDIN>;
+		chomp $data;
+		$read_max=$read_max-length($data);
+		return $data;
+	} else {
+		return "";
+	}
+}  
+
+#
+# test post/read callback functions - requires a url which accepts posts, or it fails!
+#
+
+Curl::easy::setopt($curl,CURLOPT_READFUNCTION,\&read_callb);
+Curl::easy::setopt($curl,CURLOPT_INFILESIZE,$read_max );
+Curl::easy::setopt($curl,CURLOPT_UPLOAD,1 );
+Curl::easy::setopt($curl,CURLOPT_CUSTOMREQUEST,"POST" );
+                                                       
+if (Curl::easy::perform($curl) != 0) {
+	print "not ";
+};
+print "ok 16\n";
+
+sub passwd_callb
+{
+    my ($clientp,$prompt,$buflen)=@_;
+    print "\nperl passwd_callback has been called!\n";
+    print "clientp: $clientp, prompt: $prompt, buflen: $buflen\n";
+    print "\nEnter max $buflen characters for $prompt ";
+    my $data = <STDIN>;
+    chomp($data);
+    return (0,$data);
+}                                                         
+
+Curl::easy::cleanup($curl);
+
+# Now do an ftp upload:
+
+$defurl = "ftp://horn\@localhost//tmp/bla";
+print "\n\nPlease enter an URL for ftp upload [$defurl]: ";
+$url = <STDIN>;
+if ($url =~ /^\s*\n/) {
+    $url = $defurl;
+}
+
+# Init the curl session
+if (($curl = Curl::easy::init()) != 0) {
+    print "ok 17\n";
+} else {
+    print "not ok 17\n";
+}
+
+# Set URL to get
+if (Curl::easy::setopt($curl, Curl::easy::CURLOPT_URL, $url) == 0) {
+    print "ok 18\n";
+} else {
+    print "not ok 18\n";
+
+}
+
+# Tell libcurl to to an upload
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_UPLOAD, 1);
+
+# No progress meter please
+#Curl::easy::setopt($curl, Curl::easy::CURLOPT_NOPROGRESS, 1);
+
+# Use our own progress callback
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_PROGRESSFUNCTION, \&prog_callb);
+
+# Shut up completely
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_MUTE, 1);
+
+# Store error messages in $errbuf
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_ERRORBUFFER, "errbuf");
+
+$read_max=10;
+# Use perl read callback to read data to be uploaded
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_READFUNCTION,
+    \&read_callb);
+
+# Use perl passwd callback to read password for login to ftp server
+Curl::easy::setopt($curl, Curl::easy::CURLOPT_PASSWDFUNCTION, \&passwd_callb);
+
+print "ok 19\n";
+
+# Go get it
+if (Curl::easy::perform($curl) == 0) {
+    Curl::easy::getinfo($curl, Curl::easy::CURLINFO_SIZE_UPLOAD, $bytes);
+    print "ok 20: $bytes bytes transferred\n\n";
+} else {
+    # We can acces the error message in $errbuf here
+    print "not ok 20: '$errbuf'\n";
+}
+
+# Cleanup
+Curl::easy::cleanup($curl);
+print "ok 21\n";
+

perl/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = Curl_easy
+
+EXTRA_DIST = README

perl/README

@@ -1,33 +1,18 @@
-This is just a small collection of perl scripts that use curl to do
-their jobs.
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
 
-If you need a proxy configuration in order to get HTTP or FTP
-documents, do edit your .curlrc file in your HOME dir to contain:
--x <proxy host>:<proxy port>
+Perl
 
-These scripts are all written by Daniel Stenberg.
+ Perl's a great script language, not the least for quick prototyping. Curl is
+elegantly used from within it. You can either invoke external curl command
+line or use the curl interface.
 
-checklinks.pl
-=============
-  This script fetches an HTML page, extracts all links and references to
-  other documents and then goes through them to check that they work.
-  Reports progress in a format intended for machine-parsing.
+ Georg Horn's Perl interface to curl is available in the Curl_easy/
+subdirectory. Using the Curl::easy module is just straightforward and
+works much like using libcurl in a C programm, so please refer to the
+documentation of libcurl. Have a look at test.pl to get an idea of how
+to start.
 
-getlinks.pl
-===========
-  You ever wanted to download a bunch of programs a certain HTML page has
-  links to? This program extracts all links and references from a web page
-  and then compares them to the regex you supply. All matches will be
-  downloaded in the target directory of your choice.
-
-recursiveftpget.pl
-==================
-  This script recursively downloads all files from a directory on an ftp site
-  and all subdirectories it has. Optional depth-level.
-
-formfind.pl
-===========
-  Downloads an HTML page (or reads stdin) and reports a human readable report
-  about the FORM(s) present. What method, what URL, which input or select
-  field, what default values they have and what submit buttons there are. It
-  is useful if you intend to use curl to properly fake a form submission.

perl/contrib/mirror.pl

@@ -0,0 +1,104 @@
+#!/usr/bin/perl
+
+#
+# Author:  Daniel Stenberg <daniel@haxx.se>
+# Version: 0.1
+# Date:    October 10, 2000
+#
+# This is public domain. Feel free to do whatever you please with this script.
+# There are no warranties whatsoever! It might work, it might ruin your hard
+# disk. Use this on your own risk.
+#
+# PURPOSE
+#
+# This script uses a local directory to maintain a "mirror" of the curl
+# packages listed in the remote curl web sites package list. Files present in
+# the local directory that aren't present in the remote list will be removed.
+# Files that are present in the remote list but not in the local directory
+# will be downloaded and put there. Files present at both places will not
+# be touched.
+#
+# WARNING: don't put other files in the mirror directory, they will be removed
+# when this script runs if they don't exist in the remote package list!
+#
+
+# this is the directory to keep all the mirrored curl files in:
+$some_dir = $ARGV[0];
+
+if( ! -d $some_dir ) {
+    print "$some_dir is not a dir!\n";
+    exit;
+}
+
+# path to the curl binary
+$curl = "/home/danste/bin/curl";
+
+# this is the remote file list
+$filelist = "http://curl.haxx.se/download/curldist.txt";
+
+# prepend URL:
+$prepend = "http://curl.haxx.se/download";
+
+opendir(DIR, $some_dir) || die "can't opendir $some_dir: $!";
+@existing = grep { /^[^\.]/ } readdir(DIR);
+closedir DIR;
+
+$LOCAL_FILE =  1;
+$REMOTE_FILE = 2;
+
+# create a hash array
+for(@existing) {
+    $allfiles{$_} |= $LOCAL_FILE;
+}
+
+# get remote file list
+print "Getting file list from $filelist\n";
+@remotefiles=`$curl -s $filelist`;
+
+# fill in the hash array
+for(@remotefiles) {
+    chomp;
+    $allfiles{$_} |= $REMOTE_FILE;
+    $remote++;
+}
+if($remote < 10) {
+    print "There's something wrong. The remote file list seems too smallish!\n";
+    exit;
+}
+
+@sfiles = sort { $a cmp $b } keys %allfiles;
+
+
+$leftalone = $downloaded = $removed = 0;
+for(@sfiles) {
+    $file = $_;
+    $info = $allfiles{$file};
+
+    if($info == ($REMOTE_FILE|$LOCAL_FILE)) {
+        print "$file is LOCAL and REMOTE, left alone\n";
+        $leftalone++;
+    }
+    elsif($info == $REMOTE_FILE) {
+        print "$file is only REMOTE, getting it...\n";
+        system("$curl $prepend/$file -o $some_dir/$file");
+        $downloaded++;
+    }
+    elsif($info == $LOCAL_FILE) {
+        print "$file is only LOCAL, removing it...\n";
+        system("rm $some_dir/$file");
+        $removed++;
+    }
+    else {
+        print "Problem, file $file was marked $info\n";
+    }
+    $loops++;
+}
+
+if(!$loops) {
+    print "No remote or local files were found!\n";
+    exit;
+}
+
+print "$leftalone files were already present\n",
+    "$downloaded files were added\n",
+    "$removed files were removed\n";

php/Makefile.am

@@ -0,0 +1,2 @@
+SUBDIRS = examples
+EXTRA_DIST = README

php/README

@@ -0,0 +1,15 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+PHP
+
+There's an excellent interface to curl written for PHP by Sterling Hughes. See
+the subdirectory examples/ for some examples on how to program with it.
+
+Unfortunately, we don't have much more information about the interface
+included here yet, but there's a detailed online manual for it over at:
+
+        http://www.php.net/manual/ref.curl.php

php/examples/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = README getpageinvar.php simpleget.php simplepost.php

php/examples/README

@@ -0,0 +1,16 @@
+                                  _   _ ____  _     
+                              ___| | | |  _ \| |    
+                             / __| | | | |_) | |    
+                            | (__| |_| |  _ <| |___ 
+                             \___|\___/|_| \_\_____|
+
+PHP program examples
+
+getpageinvar.php
+ - Fetch a single URL and return in a variable
+
+simpleget.php
+ - A very simple example that gets a HTTP page
+
+simplepost.php
+ - Example that sends a HTTP POST to a remote site

src/main.c

@@ -21,10 +21,14 @@
  * $Id$
  *****************************************************************************/
 
+/* This is now designed to have its own local setup.h */
+#include "setup.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
@@ -38,14 +42,6 @@
 
 #define CURLseparator	"--_curl_--"
 
-/* This define make use of the "Curlseparator" as opposed to the
-   MIMEseparator. We might add support for the latter one in the
-   future, and that's why this is left in the source. */
-#define CURL_SEPARATORS
-
-/* This is now designed to have its own local setup.h */
-#include "setup.h"
-
 #if defined(WIN32)&&!defined(__CYGWIN32__)
 #include <winsock.h>
 #endif
@@ -247,9 +243,11 @@ static void help(void)
        "    --data-ascii <data>   HTTP POST ASCII data (H)\n"
        "    --data-binary <data>  HTTP POST binary data (H)\n"
        " -D/--dump-header <file> Write the headers to this file\n"
+       "    --egd-file <file> EGD socket path for random data (SSL)\n"
        " -e/--referer       Referer page (H)");
   puts(" -E/--cert <cert[:passwd]> Specifies your certificate file and password (HTTPS)\n"
        "    --cacert <file> CA certifciate to verify peer against (HTTPS)\n"
+       "    --connect-timeout <seconds> Maximum time allowed for connection\n"
        " -f/--fail          Fail silently (no output at all) on errors (H)\n"
        " -F/--form <name=content> Specify HTTP POST data (H)\n"
        " -g/--globoff       Disable URL sequences and ranges using {} and []\n"
@@ -275,6 +273,7 @@ static void help(void)
   puts(" -r/--range <range> Retrieve a byte range from a HTTP/1.1 or FTP server\n"
        " -s/--silent        Silent mode. Don't output anything\n"
        " -S/--show-error    Show error. With -s, make curl show errors when they occur\n"
+       "    --stderr <file> Where to redirect stderr. - means stdout.\n"
        " -t/--telnet-option <OPT=val> Set telnet option\n"
        " -T/--upload-file <file> Transfer/upload <file> to remote site\n"
        "    --url <URL>     Another way to specify URL to work with");
@@ -284,6 +283,7 @@ static void help(void)
        " -V/--version       Outputs version number then quits\n"
        " -w/--write-out [format] What to output after completion\n"
        " -x/--proxy <host[:port]>  Use proxy. (Default port is 1080)\n"
+       "    --random-file <file> File to use for reading random data from (SSL)\n"
        " -X/--request <command> Specific request command to use");
   puts(" -y/--speed-time    Time needed to trig speed-limit abort. Defaults to 30\n"
        " -Y/--speed-limit   Stop transfer if below speed-limit for 'speed-time' secs\n"
@@ -292,10 +292,7 @@ static void help(void)
        " -2/--sslv2         Force usage of SSLv2 (H)\n"
        " -3/--sslv3         Force usage of SSLv3 (H)");
   puts(" -#/--progress-bar  Display transfer progress as a progress bar\n"
-       "    --crlf          Convert LF to CRLF in upload. Useful for MVS (OS/390)\n"
-       "    --stderr <file> Where to redirect stderr. - means stdout.\n"
-       "    --random-file <file> File to use for reading random data from (SSL)\n"
-       "    --egd-file <file> EGD socket path for random data (SSL)");
+       "    --crlf          Convert LF to CRLF in upload. Useful for MVS (OS/390)");
 }
 
 struct LongShort {
@@ -315,6 +312,7 @@ struct Configurable {
   long postfieldsize;
   char *referer;
   long timeout;
+  long connecttimeout;
   long maxredirs;
   char *headerfile;
   char *ftpport;
@@ -528,6 +526,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
     {"5", "url",         TRUE},
     {"5a", "random-file", TRUE},
     {"5b", "egd-file",   TRUE},
+    {"5c", "connect-timeout", TRUE},
 
     {"2", "sslv2",       FALSE},
     {"3", "sslv3",       FALSE},
@@ -684,6 +683,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
       case 'b': /* egd-file */
         GetStr(&config->egd_file, nextarg);
         break;
+      case 'c': /* connect-timeout */
+        config->connecttimeout=atoi(nextarg);
+        break;
       default: /* the URL! */
         {
           struct getout *url;
@@ -1839,6 +1841,7 @@ operate(struct Configurable *config, int argc, char *argv[])
       /* new in libcurl 7.7: */
       curl_easy_setopt(curl, CURLOPT_RANDOM_FILE, config->random_file);
       curl_easy_setopt(curl, CURLOPT_EGDSOCKET, config->egd_file);
+      curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, config->connecttimeout);
       
       res = curl_easy_perform(curl);
         

src/version.h

@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.7-beta3"
+#define CURL_VERSION "7.7.2"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "

src/writeout.c

@@ -141,12 +141,12 @@ void ourWriteOut(CURL *curl, char *writeinfo)
               case VAR_SIZE_UPLOAD:
                 if(CURLE_OK ==
                    curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD, &doubleinfo))
-                  fprintf(stream, "%.3f", doubleinfo);
+                  fprintf(stream, "%.0f", doubleinfo);
                 break;
               case VAR_SIZE_DOWNLOAD:
                 if(CURLE_OK ==
                    curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &doubleinfo))
-                  fprintf(stream, "%.3f", doubleinfo);
+                  fprintf(stream, "%.0f", doubleinfo);
                 break;
               case VAR_SPEED_DOWNLOAD:
                 if(CURLE_OK ==

tests/data/Makefile.am

@@ -4,7 +4,7 @@ install:
 test:
 	[ -f command1.txt ] || ln -s $(srcdir)/*.txt .
 
-EXTRA_DIST = command1.txt      error113.txt      name17.txt        prot8.txt \
+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 \
@@ -66,4 +66,6 @@ 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
+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

tests/data/command38.txt

@@ -0,0 +1 @@
+http://user:pwd@%HOSTIP:%HOSTPORT/38 -L

tests/data/command39.txt

@@ -0,0 +1,3 @@
+http://%HOSTIP:%HOSTPORT/want/39 -L -C 20
+
+

tests/data/name38.txt

@@ -0,0 +1 @@
+HTTP GET with user+password in URL and Location: and --include

tests/data/name39.txt

@@ -0,0 +1 @@
+HTTP GET with location following and -C

tests/data/prot11.txt

@@ -1,3 +1,8 @@
+GET /want/11 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
 GET /want/data/110002.txt?coolsite=yes HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache

tests/data/prot18.txt

@@ -1,5 +1,14 @@
-GET /11 HTTP/1.1
-User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2
+GET /3 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /10 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /11 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

tests/data/prot27.txt

@@ -1,5 +1,14 @@
-GET /want/22 HTTP/1.1
-User-Agent: curl/7.6-pre1 (sparc-sun-solaris2.7) libcurl 7.6-pre1 (SSL 0.9.6) (krb4 enabled)
+GET /want/25 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/24 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+GET /want/22 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*

tests/data/prot31.txt

@@ -1,5 +1,12 @@
-POST /moo/moo/moo/310002 HTTP/1.1
-User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
+POST /31 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 9
+Content-Type: application/x-www-form-urlencoded
+
+mooo=fooo
+POST /moo/moo/moo/310002 HTTP/1.1
 Host: 127.0.0.1:8999
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*