While working on Mget I stepped over some little things in Wget ... Regards, Tim
From 2cb8f3781c4e948eafec97a5e99ba5e03bb52ac1 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen <[email protected]> Date: Tue, 28 Aug 2012 16:38:21 +0200 Subject: [PATCH 1/4] remove -nv from --report-speed in doc/wget.texi
--- doc/ChangeLog | 4 ++++ doc/wget.texi | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index df76c53..b60a307 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-08-28 Tim Ruehsen <[email protected]> + + * doc/wget.texi: remove -nv from --report-speed + 2012-08-04 mancha <[email protected]> (tiny change) * wget.texi: Export ENVIRONMENT to the man page. diff --git a/doc/wget.texi b/doc/wget.texi index 7efdc72..400debe 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -479,8 +479,7 @@ Turn off verbose without being completely quiet (use @samp{-q} for that), which means that error messages and basic information still get printed. -@item -nv -@itemx --report-speed=@var{type} +@item --report-speed=@var{type} Output bandwidth as @var{type}. The only accepted value is @samp{bits}. @cindex input-file -- 1.7.10.4
From 88a34a6fd316ba698c46283b13d785bd3443a412 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen <[email protected]> Date: Tue, 28 Aug 2012 16:43:52 +0200 Subject: [PATCH 2/4] deinit gnutls_x509_crt_t --- src/gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gnutls.c b/src/gnutls.c index 32c6d17..69b1cb2 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -515,7 +515,7 @@ ssl_check_certificate (int fd, const char *host) { logprintf (LOG_NOTQUIET, _("No certificate found\n")); success = false; - goto out; + goto crt_deinit; } err = gnutls_x509_crt_import (cert, cert_list, GNUTLS_X509_FMT_DER); if (err < 0) @@ -523,7 +523,7 @@ ssl_check_certificate (int fd, const char *host) logprintf (LOG_NOTQUIET, _("Error parsing certificate: %s\n"), gnutls_strerror (err)); success = false; - goto out; + goto crt_deinit; } if (now < gnutls_x509_crt_get_activation_time (cert)) { @@ -542,6 +542,7 @@ ssl_check_certificate (int fd, const char *host) quote (host)); success = false; } + crt_deinit: gnutls_x509_crt_deinit (cert); } -- 1.7.10.4
From e17f19fc657dd2a489e92f7efb90c77a48bf8f5e Mon Sep 17 00:00:00 2001 From: Tim Ruehsen <[email protected]> Date: Tue, 28 Aug 2012 16:58:40 +0200 Subject: [PATCH 3/4] don't error if CA directory is empty --- src/gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gnutls.c b/src/gnutls.c index 69b1cb2..614f634 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -99,7 +99,7 @@ ssl_init (void) dir = opendir (ca_directory); if (dir == NULL) { - if (opt.ca_directory) + if (*opt.ca_directory) logprintf (LOG_NOTQUIET, _("ERROR: Cannot open directory %s.\n"), opt.ca_directory); } -- 1.7.10.4
From 1e1063c38df00b1bd033e7d44413abe21b46145f Mon Sep 17 00:00:00 2001 From: Tim Ruehsen <[email protected]> Date: Tue, 28 Aug 2012 17:04:09 +0200 Subject: [PATCH 4/4] added src/Changelog entry --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 7830e94..e425e7d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-08-28 Tim Ruehsen <[email protected]> + + * gnutls.c/ssl_check_certificate: deinit gnutls_x509_crt_t + * gnutls.c/ssl_init: don't error if CA directory is empty + 2012-08-25 Hrvoje Niksic <[email protected]> * warc.c (warc_find_duplicate_cdx_record): Use hash_table_get -- 1.7.10.4
