[glib-networking/mcatanzaro/base-rebase: 47/55] fixup! openssl: fix shutdown error
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/base-rebase: 47/55] fixup! openssl: fix shutdown error
- Date: Wed, 15 May 2019 14:06:33 +0000 (UTC)
commit 606b0e1fab9f66f661c86f84fce76d28aa3fbb70
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date: Tue May 14 16:31:49 2019 +0200
fixup! openssl: fix shutdown error
tls/openssl/gtlsconnection-openssl.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/tls/openssl/gtlsconnection-openssl.c b/tls/openssl/gtlsconnection-openssl.c
index 9a5d777..5b7f979 100644
--- a/tls/openssl/gtlsconnection-openssl.c
+++ b/tls/openssl/gtlsconnection-openssl.c
@@ -105,9 +105,13 @@ end_openssl_io (GTlsConnectionOpenssl *openssl,
}
/* This case is documented that it may happen and that is perfectly fine */
- if (err_code == SSL_ERROR_SYSCALL && priv->shutting_down &&
- (!my_error || g_error_matches(my_error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE)))
- return G_TLS_CONNECTION_BASE_OK;
+ if (err_code == SSL_ERROR_SYSCALL &&
+ ((priv->shutting_down && !my_error) ||
+ g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_BROKEN_PIPE)))
+ {
+ g_clear_error (&my_error);
+ return G_TLS_CONNECTION_BASE_OK;
+ }
err = ERR_get_error ();
err_lib = ERR_GET_LIB (err);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]