diff options
Diffstat (limited to 'net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c')
| -rw-r--r-- | net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c index 1e8f45fb017f..58b3a1168620 100644 --- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c +++ b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c @@ -1,8 +1,8 @@ ---- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2012-03-04 18:47:23.000000000 -0500 -+++ tls/gnutls/gtlsclientconnection-gnutls.c 2012-03-04 18:50:26.000000000 -0500 -@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha - { - GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn); +--- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2015-03-17 14:53:17.000000000 +0100 ++++ tls/gnutls/gtlsclientconnection-gnutls.c 2015-03-17 16:02:39.897699000 +0100 +@@ -309,7 +309,8 @@ g_tls_client_connection_gnutls_finish_ha + + g_assert (inout_error != NULL); - if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) && + if (inout_error && @@ -10,12 +10,12 @@ gnutls->priv->cert_requested) { g_clear_error (inout_error); -@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha - { - gnutls_datum session_data; +@@ -327,7 +328,7 @@ g_tls_client_connection_gnutls_finish_ha -- if (!*inout_error && -+ if (inout_error && !*inout_error && - gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn), - &session_data) == 0) + if (gnutls->priv->session_id) + { +- if (!*inout_error) ++ if (inout_error && !*inout_error) { + if (!gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn))) + { |