=== modified file 'ChangeLog'
--- ChangeLog	2011-09-04 12:19:12 +0000
+++ ChangeLog	2011-10-30 17:02:59 +0000
@@ -1,3 +1,38 @@
+2011-10-30  Gijs van Tulder <address@hidden>
+
+	Add support for writing HTTP and FTP requests and responses to
+	WARC files.
+
+	* bootstrap.conf (gnulib_modules): Add `base32', `crypto/sha1`,
+	`tmpdir'.
+
+	* configure.ac: Check for libuuid and use it if it is available.
+
+	* src/Makefile.am (wget_sources): Add `src/warc.c' and `src/warc.h'.
+
+	* src/ftp.c: Save downloaded files to a WARC file (if enabled).
+
+	* src/http.c: Save requests and responses to a WARC file (if enabled).
+	Add a function `read_response_body' to help read the HTTP response.
+
+	* src/init.c: Add options for creating WARC files.
+	* src/main.c: Likewise.
+	* src/options.c: Likewise.
+
+	* src/log.c: If WARC is enabled, keep a copy of the log to add to
+	the WARC metadata file.  Add new function `log_set_warc_log_fp'.
+	* src/log.h: Likewise.
+
+	* src/retr.c: Modify `write_data' and `fd_read_body' to write to two
+	output streams at the same time.
+	* src/retr.h: Likewise.
+
+	* src/warc.c: Add new file with functions for producing WARC files.
+	* src/warc.h: Likewise.
+
+	* src/wget.h: Add new error codes: `WARC_ERR', `WARC_TMP_FOPENERR',
+	`WARC_TMP_FWRITEERR'.
+
 2011-09-04  Alan Hourihane <address@hidden> (tiny change)
 
 	* configure.ac: Check for libz when gnutls is used.

=== modified file 'configure.ac'
--- configure.ac	2011-09-04 12:19:12 +0000
+++ configure.ac	2011-10-30 16:34:30 +0000
@@ -511,7 +511,19 @@
   fi
 fi
 
-
+dnl
+dnl Check for UUID
+dnl
+
+AC_CHECK_HEADER(uuid/uuid.h,
+                AC_CHECK_LIB(uuid, uuid_generate,
+                  [LIBS="${LIBS} -luuid"
+                   AC_DEFINE([HAVE_LIBUUID], 1,
+                             [Define if libuuid is available.])
+                  ])
+)
+
+ 
 dnl Needed by src/Makefile.am
 AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-08-18 12:00:57 +0000
+++ src/Makefile.am	2011-10-23 21:36:27 +0000
@@ -46,13 +46,13 @@
 	       css_.c css-url.c \
 	       ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
 	       http.c init.c log.c main.c netrc.c progress.c ptimer.c     \
-	       recur.c res.c retr.c spider.c url.c	          	  \
+	       recur.c res.c retr.c spider.c url.c warc.c	          	  \
 	       utils.c exits.c build_info.c $(IRI_OBJ)			  \
 	       css-url.h css-tokens.h connect.h convert.h cookies.h       \
 	       ftp.h hash.h host.h html-parse.h html-url.h      \
 	       http.h http-ntlm.h init.h log.h mswindows.h netrc.h        \
 	       options.h progress.h ptimer.h recur.h res.h retr.h         \
-	       spider.h ssl.h sysdep.h url.h utils.h wget.h iri.h 	  \
+	       spider.h ssl.h sysdep.h url.h warc.h utils.h wget.h iri.h 	  \
 	       exits.h gettext.h
 nodist_wget_SOURCES = version.c
 EXTRA_wget_SOURCES = iri.c