Changeset 2ceb836 in mod_gnutls

Timestamp:

Nov 20, 2015, 7:37:15 PM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

a2368a4

Parents:

401a0de

git-author:

Thomas Klute <thomas2.klute@…> (11/20/15 19:33:57)

git-committer:

Thomas Klute <thomas2.klute@…> (11/20/15 19:37:15)

Message:

Update log messages on session termination (cleanup_gnutls_session, mgs_bye)

• Pass proper APR error codes to ap_log_cerror

• Warn if a TLS session was not properly terminated by the filters (cleanup_gnutls_session only)

Location:

src

Files:

• gnutls_hooks.c (modified) (3 diffs)
• gnutls_io.c (modified) (2 diffs)

src/gnutls_hooks.c

@@ -694 +694 @@
 }
 
-/*
+/**
  * This function is intended as a cleanup handler for connections
- * using GnuTLS.
+ * using GnuTLS. If attached to the connection pool, it ensures that
+ * session resources are released with the connection pool even if the
+ * session wasn't terminated properly.
  *
  * @param data must point to the mgs_handle_t associated with the
@@ -711 +713 @@
     if (ctxt->session != NULL)
     {
+        ap_log_cerror(APLOG_MARK, APLOG_WARNING, APR_ECONNABORTED, ctxt->c,
+                      "%s: connection pool cleanup in progress but %sTLS "
+                      "session hasn't been terminated, trying to close",
+                      __func__, IS_PROXY_STR(ctxt));
         int ret;
         /* Try A Clean Shutdown */
@@ -717 +723 @@
         while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
         if (ret != GNUTLS_E_SUCCESS)
-            ap_log_cerror(APLOG_MARK, APLOG_INFO, ret, ctxt->c,
+            ap_log_cerror(APLOG_MARK, APLOG_INFO, APR_EGENERAL, ctxt->c,
                           "%s: error while closing TLS %sconnection: %s (%d)",
                           __func__, IS_PROXY_STR(ctxt),
                           gnutls_strerror(ret), ret);
         else
-            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, ret, ctxt->c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
                           "%s: TLS %sconnection closed.",
                           __func__, IS_PROXY_STR(ctxt));

src/gnutls_io.c

@@ -513 +513 @@
         } while (ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
         if (ret != GNUTLS_E_SUCCESS)
-            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, ctxt->c,
                           "%s: Error while closing TLS %sconnection: "
                           "'%s' (%d)",
@@ -519 +519 @@
                           gnutls_strerror(ret), (int) ret);
         else
-            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
                           "%s: TLS %sconnection closed.",
                           __func__, IS_PROXY_STR(ctxt));