Changeset 73f6f12 in mod_gnutls for src

Timestamp:

Apr 16, 2015, 6:46:36 AM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

2cde026d

Parents:

f030883

Message:

Check handshake result before logging "TLS connection opened"

Without these checks the "TLS connection opened" message is logged even
after a failed handshake, which is confusing.

File:

• src/gnutls_io.c (modified) (3 diffs)

src/gnutls_io.c

@@ -458 +458 @@
             }
         }
-        return 0;
+        return GNUTLS_E_SUCCESS;
     }
 }
@@ -505 +505 @@
 
     if (ctxt->status == 0) {
-        gnutls_do_handshake(ctxt);
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
-                      "%s: TLS %sconnection opened.",
-                      __func__, IS_PROXY_STR(ctxt));
+        int ret = gnutls_do_handshake(ctxt);
+        if (ret == GNUTLS_E_SUCCESS)
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
+                          "%s: TLS %sconnection opened.",
+                          __func__, IS_PROXY_STR(ctxt));
     }
 
@@ -606 +607 @@
 
     if (ctxt->status == 0) {
-        gnutls_do_handshake(ctxt);
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
-                      "%s: TLS %sconnection opened.",
-                      __func__, IS_PROXY_STR(ctxt));
+        ret = gnutls_do_handshake(ctxt);
+        if (ret == GNUTLS_E_SUCCESS)
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctxt->c,
+                          "%s: TLS %sconnection opened.",
+                          __func__, IS_PROXY_STR(ctxt));
     }