From face7270f92bd8d47e74ea583a33f1fcbca96579 Mon Sep 17 00:00:00 2001 From: noha Date: Tue, 11 Dec 2018 09:11:29 -0800 Subject: [PATCH] Applying the gnutls_bye changes applied in MPL --- cups/tls-gnutls.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index 48bc11a..98cc8b4 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -1576,7 +1576,9 @@ _httpTLSStop(http_t *http) /* I - Connection to server */ int error; /* Error code */ - error = gnutls_bye(http->tls, http->mode == _HTTP_MODE_CLIENT ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR); + // 12/06/2018 Mopria-notice: Using GNUTLS_SHUT_RDWR causes a 30 seconds timeout + // when the server does not respond with the shut down message + error = gnutls_bye(http->tls, GNUTLS_SHUT_WR); if (error != GNUTLS_E_SUCCESS) _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gnutls_strerror(errno), 0);