[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-wget] [PATCH] timeout option is ingnored if host does not answe
From: |
Giuseppe Scrivano |
Subject: |
Re: [Bug-wget] [PATCH] timeout option is ingnored if host does not answer SSL handshake (openssl) |
Date: |
Thu, 11 Jul 2013 19:41:55 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) |
Tomas Hozza <address@hidden> writes:
> From b565c9fcf37fb8d71b3c338f0ec8982295e283fe Mon Sep 17 00:00:00 2001
> From: Karsten Hopp <address@hidden>
> Date: Thu, 11 Jul 2013 11:27:35 +0200
> Subject: [PATCH] Fix timeout option when used with SSL
>
> Previously wget didn't honor the --timeout option if the remote host did
> not answer SSL handshake
>
> Signed-off-by: Tomas Hozza <address@hidden>
> ---
> src/openssl.c | 62
> ++++++++++++++++++++++++++++++++++++++++++++++++++---------
> 1 file changed, 53 insertions(+), 9 deletions(-)
Thanks to have submitted the patch. It looks fine (I have just a minor
comment below). Could I please ask you to provide also the entries for
the ChangeLog file as part of your patch? It is a boring task but this
is required by the GNU Coding standards[1]. If you have no time for
this, I can do it.
> diff --git a/src/openssl.c b/src/openssl.c
> @@ -425,7 +461,14 @@ ssl_connect_wget (int fd, const char *hostname)
> if (!SSL_set_fd (conn, FD_TO_SOCKET (fd)))
> goto error;
> SSL_set_connect_state (conn);
> - if (SSL_connect (conn) <= 0 || conn->state != SSL_ST_OK)
> +
> + scwt_ctx.ssl = conn;
> + if (run_with_timeout(opt.read_timeout, ssl_connect_with_timeout_callback,
trailing whitespace. git am complained about it.
--
Giuseppe
1) http://www.gnu.org/prep/standards/standards.html#Change-Logs