Changeset 92cb0cc in mod_gnutls for src/gnutls_io.c

Timestamp:

Dec 12, 2018, 4:15:40 PM (22 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

2038b76

Parents:

5c56e5b

Message:

Handle APR_TIMEUP return value from blocking ap_get_brigade() call

The API documentation does not say under which conditions this may
happen, so I have to replicate mod_ssl behavior here, which is
basically the same as for APR_EAGAIN.

File:

• src/gnutls_io.c (modified) (1 diff)

src/gnutls_io.c

@@ -878 +878 @@
         }
 
+        /* Blocking ap_get_brigade() can return a timeout status,
+         * sometimes after a very short time. "Don't give up, just
+         * return the timeout" is what mod_ssl does. */
+        if (ctxt->input_block == APR_BLOCK_READ
+            && APR_STATUS_IS_TIMEUP(rc)
+            && APR_BRIGADE_EMPTY(ctxt->input_bb))
+        {
+            ctxt->input_rc = rc;
+            gnutls_transport_set_errno(ctxt->session, EAGAIN);
+            return -1;
+        }
+
         if (rc != APR_SUCCESS)
         {
             /* Unexpected errors discard the brigade */
+            ap_log_cerror(APLOG_MARK, APLOG_INFO, rc, ctxt->c,
+                          "%s: Unexpected error!", __func__);
             apr_brigade_cleanup(ctxt->input_bb);
             ctxt->input_bb = NULL;