[glib-networking] Revert "gnutls: discard queued data after interrupted writes"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] Revert "gnutls: discard queued data after interrupted writes"
- Date: Mon, 2 Sep 2019 22:25:15 +0000 (UTC)
commit 8486446b371de671fa514cb6490f04a6c6361c4a
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Sep 2 17:21:49 2019 -0500
Revert "gnutls: discard queued data after interrupted writes"
This reverts commit 6be22b13b6958896e6b6b462e0e521aaf82f4c59.
See #15 for details.
Technically we have a little over an hour left before hard code freeze
begins, so I think it's OK to sneak this in now.
tls/gnutls/gtlsconnection-gnutls.c | 6 ------
1 file changed, 6 deletions(-)
---
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 27b1456..2ea627b 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -1020,12 +1020,6 @@ g_tls_connection_gnutls_write (GTlsConnectionBase *tls,
ret = gnutls_record_send (priv->session, buffer, count);
END_GNUTLS_IO (gnutls, G_IO_OUT, ret, status, _("Error writing data to TLS socket"), error);
- /* GnuTLS will resend interrupted writes unless we discard its send queue.
- * But GOutputStream requires explicit resend when interrupted.
- */
- if (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN)
- gnutls_record_discard_queued (priv->session);
-
*nwrote = MAX (ret, 0);
return status;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]