Automated merge with file:/home/micah/devel/wget/eleven

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0989f76e815feb67023ba02bb948b90f17ed1159..42ae9897388ca1a7578dffc7d52c6c6f17981def 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-10  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi <Wgetrc Commands>: Fixed "doewnloads" typo.
+
 2007-10-08  Micah Cowan  <micah@cowan.name>
 
        * wget.texi: Credit to Ralf Wildenhues for automakifying patches.

diff --git a/doc/wget.texi b/doc/wget.texi
index 0f66f17beebabfa85ceed56290fb8f1da6f9672d..32f5980726b0728b7ddad35fd265adbe3c11a3dd 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2659,7 +2659,7 @@ This command used to be named @code{login} prior to Wget 1.10.
 Turn globbing on/off---the same as @samp{--glob} and @samp{--no-glob}.
 
 @item header = @var{string}
-Define a header for HTTP doewnloads, like using
+Define a header for HTTP downloads, like using
 @samp{--header=@var{string}}.
 
 @item html_extension = on/off

diff --git a/src/ChangeLog b/src/ChangeLog
index 765585344f105bf72df6feb2bacc8cd392347c5e..fc900a8cd7ce1fb577784278d80d92f35bf9eb69 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-10  Micah Cowan  <micah@cowan.name>
+
+       * http-ntlm.c: Include openssl/opensslv.h explicitly, instead of
+       hoping it'll be included by accident in openssl/des.h.
+
 2007-10-09  Gisle Vanem  <gvanem@broadpark.no>
 
        * mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer

diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 054c8a95939a18b3fced17d09d87cd279de28a20..32bb3c59355b2180b13144e7ecb4b652926b650d 100644 (file)
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -42,6 +42,7 @@ so, delete this exception statement from your version.  */
 
 #include <openssl/des.h>
 #include <openssl/md4.h>
+#include <openssl/opensslv.h>
 
 #include "wget.h"
 #include "utils.h"