Automated merge with file:/home/micah/devel/wget/eleven-repo-mentions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 783eb880f4d2e422f09a30ba8fc210508917de11..b2f017c25bdff8128f713e9958cdc9effb1f75ae 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-03  Micah Cowan  <micah@cowan.name>
 
        * wget.texi <Wgetrc Commands>: Cleaned up alphabetization,

diff --git a/doc/wget.texi b/doc/wget.texi
index a8ca8406d5f12c8ceb58d970a77e4f9883b2851a..9b48917bac75333c9615a507df029c3759baf942 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 f3b0e539d18d3f889a9a22ac2ce6732b25944c00..fb336cebf2a1815e9375b88daa29fbb16db93886 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+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
+       needed.  Hence simply the prototype. Free 'exec_name' at exit.
+
 2007-10-08  Micah Cowan  <micah@cowan.name>
 
        * http.c (http_loop): Add send_head_first conditional back

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"

diff --git a/src/main.c b/src/main.c
index 43cb344d43e203390d0480bffa8b0a7a7ed41d17..f60d0c0a940b0a3f0bc4a3392d8d9cc7c17a269e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -708,7 +708,7 @@ main (int argc, char *const *argv)
 
 #ifdef WINDOWS
   /* Drop extension (typically .EXE) from executable filename. */
-  windows_main (&argc, (char **) argv, (char **) &exec_name);
+  windows_main ((char **) &exec_name);
 #endif
 
   /* Set option defaults; read the system wgetrc and ~/.wgetrc.  */

diff --git a/src/mswindows.c b/src/mswindows.c
index de031cb0117c2aeae3ea7909e4790ad0acb3a58c..1bf8df93d31940990c72d586bf2cdf0752a37e57 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -73,7 +73,7 @@ xsleep (double seconds)
 }
 
 void
-windows_main (int *argc, char **argv, char **exec_name)
+windows_main (char **exec_name)
 {
   char *p;
 
@@ -87,6 +87,7 @@ windows_main (int *argc, char **argv, char **exec_name)
 static void
 ws_cleanup (void)
 {
+  xfree ((char*)exec_name);
   WSACleanup ();
 }
 

diff --git a/src/mswindows.h b/src/mswindows.h
index da0665d08d02a8b83a1934f7bc62124ca20f027e..d339bb32e036f456c0dc7b8b82298b06fd834d21 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -208,6 +208,6 @@ void ws_startup (void);
 void ws_changetitle (const char *);
 void ws_percenttitle (double);
 char *ws_mypath (void);
-void windows_main (int *, char **, char **);
+void windows_main (char **);
 
 #endif /* MSWINDOWS_H */