Changeset 4d38cbd in mod_gnutls

Timestamp:

Jan 3, 2019, 7:24:47 AM (17 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

a900948

Parents:

08c48d7

Message:

Return EOS/success for failed proxy TLS connections only on handshake

This prevents mod_proxy_h2 from endlessly looping while trying to send
error messages to the peer after a failed handshake.

File:

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

src/gnutls_io.c

@@ -682 +682 @@
                           "%s: TLS %sconnection opened.",
                           __func__, IS_PROXY_STR(ctxt));
-    }
-
-    if (ctxt->status < 0)
-    {
-        ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctxt->c,
-                      "%s: %sconnection failed, refusing to send.",
-                      __func__, IS_PROXY_STR(ctxt));
-        if (ctxt->is_proxy)
+        else if (ctxt->is_proxy)
         {
             /* If mod_proxy receives an error while trying to send its
@@ -700 +693 @@
             return APR_SUCCESS;
         }
-        else
-            return APR_ECONNABORTED;
+        /* No final else here, the "ctxt->status < 0" check below will
+         * catch that. */
+    }
+
+    if (ctxt->status < 0)
+    {
+        ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctxt->c,
+                      "%s: %sconnection failed, refusing to send.",
+                      __func__, IS_PROXY_STR(ctxt));
+        return APR_ECONNABORTED;
     }