6.5.2 release commit

CHANGES

@@ -6,6 +6,14 @@
 
                                History of Changes
 
+Version 6.5.2
+
+Daniel (21 March 2000):
+- Paul Harrington <paul@pizza.org> quickly pointed out to me that 6.5.1
+  crashes hard. I upload 6.5.2 now as quickly as possible! The problem was
+  the -D adjustments in src/main.c, see also a separate 6.5.1-patch on the
+  web site.
+
 Version 6.5.1
 
 Daniel (20 March 2000):

configure.in

@@ -2,7 +2,7 @@ dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(lib/urldata.h)
 AM_CONFIG_HEADER(config.h src/config.h)
-AM_INIT_AUTOMAKE(curl,"6.5.1")
+AM_INIT_AUTOMAKE(curl,"6.5.2")
 
 dnl Checks for programs.
 AC_PROG_CC

include/curl/curl.h

@@ -418,7 +418,7 @@ char *curl_GetEnv(char *variable);
 char *curl_version(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "6.5"
+#define LIBCURL_VERSION "6.5.2"
 
 /* linked-list structure for QUOTE */
 struct curl_slist {

lib/Makefile.in

@@ -77,7 +77,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 noinst_LIBRARIES = libcurl.a
 
 # Some flags needed when trying to cause warnings ;-)
-CFLAGS = -g #-Wall -pedantic
+#CFLAGS = -g -Wall -pedantic
 
 INCLUDES = -I$(top_srcdir)/include
 
@@ -99,6 +99,7 @@ formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
 speedcheck.o getdate.o download.o ldap.o ssluse.o version.o getenv.o \
 escape.o mprintf.o telnet.o getpass.o netrc.o writeout.o
 AR = ar
+CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@

src/main.c

@@ -1153,7 +1153,7 @@ int main(int argc, char *argv[])
                     URGTAG_CRLF, config.crlf,
                     URGTAG_QUOTE, config.quote,
                     URGTAG_POSTQUOTE, config.postquote,
-                    URGTAG_WRITEHEADER, &heads,
+                    URGTAG_WRITEHEADER, config.headerfile?&heads:NULL,
                     URGTAG_COOKIEFILE, config.cookiefile,
                     URGTAG_SSLVERSION, config.ssl_version,
                     URGTAG_TIMECONDITION, config.timecond,
@@ -1171,7 +1171,7 @@ int main(int argc, char *argv[])
     /* it wasn't directed to stdout or stderr so close the file! */
     fclose(config.errors);
 
-  if(!headerfilep && heads.stream)
+  if(config.headerfile && !headerfilep && heads.stream)
     fclose(heads.stream);
 
   if(urlbuffer)

src/version.h

@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "6.5"
+#define CURL_VERSION "6.5.2"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "