diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-12-10 19:50:02 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-12-10 19:50:02 +0800 |
| commit | 74d6d9d0f87f591754950c3c9290148cceaf1aaf (patch) | |
| tree | 2ad02bb938068409a8765ca521025c29b4c4b3d6 /net/glib-networking | |
| parent | 167ed09f9d154b0014c8d24a8ecb871e88df1c60 (diff) | |
| download | marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.tar marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.tar.gz marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.tar.bz2 marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.tar.lz marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.tar.xz marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.tar.zst marcuscom-ports-74d6d9d0f87f591754950c3c9290148cceaf1aaf.zip | |
Add back patch from freebsd ports that got lost somewhere.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17159 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net/glib-networking')
| -rw-r--r-- | net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c | 21 |
1 files changed, 21 insertions, 0 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 new file mode 100644 index 000000000..1e8f45fb0 --- /dev/null +++ b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c @@ -0,0 +1,21 @@ +--- 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); + +- 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); +@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha + { + gnutls_datum session_data; + +- if (!*inout_error && ++ if (inout_error && !*inout_error && + gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn), + &session_data) == 0) + { |