Changeset 2038b76 in mod_gnutls

Timestamp:

Dec 12, 2018, 4:24:36 PM (6 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

f674424

Parents:

92cb0cc

Message:

Ensure nonblocking reads pass EAGAIN or EINTR status to caller

File:

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

src/gnutls_io.c

@@ -269 +269 @@
                               "%s: looping recv after '%s' (%d)",
                               __func__, gnutls_strerror(rc), rc);
-                /* For a blocking read: Loop and try again immediately. */
+                /* For a blocking read, loop and try again
+                 * immediately. Otherwise just notify the caller. */
                 if (ctxt->input_block != APR_NONBLOCK_READ)
                     continue;
+                else
+                    ctxt->input_rc =
+                        (rc == GNUTLS_E_AGAIN ? APR_EAGAIN : APR_EINTR);
             } else if (rc == GNUTLS_E_REHANDSHAKE) {
                 /* A client has asked for a new Hankshake. Currently, we don't do it */