mirror of
https://git.freebsd.org/ports.git
synced 2025-06-23 05:30:31 -04:00
b93a80c992
The offical GNOME 3.18 release notes can be found at https://help.gnome.org/misc/release-notes/3.18/ This update doesn't contain the glib/gtk c++ bindings which will be done in a another update due to the requirement on c++11 and the amount of fallout this probably will give. GDM is still at version 3.16 due to some issues. Bump mate-themes to use the gtk 3.18 version of the themes. Thanks to Antoine Brodin for running the exp-runs. This release was made possible by the following people: Gustau Perez Ting-Wei_Lan PR: 207006
30 lines
1 KiB
C
30 lines
1 KiB
C
--- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2015-04-30 17:57:54.000000000 +0200
|
|
+++ tls/gnutls/gtlsclientconnection-gnutls.c 2015-08-06 17:06:17.000000000 +0200
|
|
@@ -322,7 +322,8 @@
|
|
|
|
g_assert (inout_error != NULL);
|
|
|
|
- if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
|
|
+ if (inout_error &&
|
|
+ g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
|
|
gnutls->priv->cert_requested)
|
|
{
|
|
g_clear_error (inout_error);
|
|
@@ -339,7 +340,7 @@
|
|
}
|
|
|
|
resumed = gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn));
|
|
- if (*inout_error || !resumed)
|
|
+ if (inout_error && *inout_error || !resumed)
|
|
{
|
|
/* Clear session data since the server did not accept what we provided. */
|
|
gnutls->priv->session_data_override = FALSE;
|
|
@@ -348,7 +349,7 @@
|
|
g_tls_backend_gnutls_remove_session (GNUTLS_CLIENT, gnutls->priv->session_id);
|
|
}
|
|
|
|
- if (!*inout_error && !resumed)
|
|
+ if (inout_error && !*inout_error && !resumed)
|
|
{
|
|
gnutls_datum_t session_datum;
|
|
|