From 7bebb42365c3bf0bee9e4618dc45bd8ca5d164a1 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 28 Nov 2007 18:29:21 +0000
Subject: upgraded to 0.4.0

---
(limited to 'src/gnutls_io.c')

diff --git a/src/gnutls_io.c b/src/gnutls_io.c
index 14e7cf6..753c87b 100644
--- a/src/gnutls_io.c
+++ b/src/gnutls_io.c
@@ -543,8 +543,7 @@ apr_status_t mgs_filter_output(ap_filter_t * f,
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
         if (AP_BUCKET_IS_EOC(bucket)) {
             do {
-                ret = gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
-                                        GNUTLS_A_CLOSE_NOTIFY);
+                ret = gnutls_bye( ctxt->session, GNUTLS_SHUT_WR);
             } while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
 
             apr_bucket_copy(bucket, &e);
@@ -556,7 +555,6 @@ apr_status_t mgs_filter_output(ap_filter_t * f,
             }
 
             apr_brigade_cleanup(ctxt->output_bb);
-            gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
             gnutls_deinit(ctxt->session);
             continue;
 
@@ -568,6 +566,7 @@ apr_status_t mgs_filter_output(ap_filter_t * f,
                 apr_brigade_cleanup(ctxt->output_bb);
                 return status;
             }
+
             apr_brigade_cleanup(ctxt->output_bb);
             continue;
         }
@@ -599,7 +598,7 @@ apr_status_t mgs_filter_output(ap_filter_t * f,
                 ap_log_error(APLOG_MARK, APLOG_INFO, ctxt->output_rc,
                              ctxt->c->base_server,
                              "GnuTLS: Error writing data."
-                             " (%d) '%s'", ret, gnutls_strerror(ret));
+                             " (%d) '%s'", (int)ret, gnutls_strerror(ret));
                 if (ctxt->output_rc == APR_SUCCESS) {
                     ctxt->output_rc = APR_EGENERAL;
                 }
--
cgit v0.9.2