Index: buildconf
===================================================================
RCS file: /cvsroot/curl/curl/buildconf,v
retrieving revision 1.9
diff -u -r1.9 buildconf
--- buildconf	21 Jan 2003 09:36:15 -0000	1.9
+++ buildconf	16 Apr 2003 21:44:50 -0000
@@ -50,7 +50,7 @@
 #--------------------------------------------------------------------------
 # automake 1.5 or newer
 #
-am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
+am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|head -1| sed -e 's/^.* \([0-9]\)/\1/' -e 's/[a-z]* *$//'`
 if test -z "$am_version"; then
   echo "buildconf: automake not found."
   echo "            You need automake version 1.5 or newer installed."
@@ -107,12 +107,12 @@
 echo "buildconf: libtool version $lt_pversion (ok)"
 
 echo "buildconf: running aclocal"
-aclocal           || die "The command 'aclocal' failed"
+${ACLOCAL:-aclocal}       || die "The command '${AUTOHEADER:-aclocal}' failed"
 echo "buildconf: running autoheader"
-autoheader        || die "The command 'autoheader' failed"
+${AUTOHEADER:-autoheader} || die "The command '${AUTOHEADER:-autoheader}' failed"
 echo "buildconf: running autoconf"
-autoconf          || die "The command 'autoconf' failed"
+${AUTOCONF:-autoconf}     || die "The command '${AUTOCONF:-autoconf}' failed"
 echo "buildconf: running automake"
-automake -a       || die "The command 'automake -a' failed"
+${AUTOMAKE:-automake} -a  || die "The command '${AUTOMAKE:-automake} -a' failed"
 
 exit 0
Index: lib/content_encoding.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/content_encoding.c,v
retrieving revision 1.6
diff -u -r1.6 content_encoding.c
--- lib/content_encoding.c	11 Apr 2003 16:31:18 -0000	1.6
+++ lib/content_encoding.c	16 Apr 2003 21:44:50 -0000
@@ -33,7 +33,7 @@
 #include <curl/types.h>
 #include "sendf.h"
 
-#define DSIZ 4096               /* buffer size for decompressed data */
+#define DSIZ 0x10000             /* buffer size for decompressed data */
 
 #define GZIP_MAGIC_0 0x1f
 #define GZIP_MAGIC_1 0x8b
@@ -248,7 +248,12 @@
       break;
 
     case GZIP_UNDERFLOW:
-      /* We need more data so we can find the end of the gzip header */
+      /* We need more data so we can find the end of the gzip header.
+      It's possible that the memory block we malloc here will never be
+      freed if the transfer abruptly aborts after this point.  Since it's
+      unlikely that circumstances will be right for this code path to be
+      followed in the first place, and it's even more unlikely for a transfer
+      to fail immediately afterwards, it should seldom be a problem. */
       z->avail_in = nread;
       z->next_in = malloc(z->avail_in);
       if (z->next_in == NULL) {