Changeset b732220 in mod_gnutls

Timestamp:

Feb 23, 2023, 6:54:09 AM (4 weeks ago)

Author:

GitHub <noreply@…>

Branches:

main, master

Children:

b2b3700, bb23c8e

Parents:

81bfee7 (diff), d7eec4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Airtower <fiona.klute@…> (02/23/23 06:54:09)

git-committer:

GitHub <noreply@…> (02/23/23 06:54:09)

Message:

Merge pull request #15 from airtower-luna/fix-timeup-loop

Fix loop in blocking read on transport timeout

File:

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

src/gnutls_io.c

@@ -3 +3 @@
  *  Copyright 2008 Nikos Mavrogiannopoulos
  *  Copyright 2011 Dash Shendy
- *  Copyright 2015-2020 Fiona Klute
+ *  Copyright 2015-2022 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -278 +278 @@
                 ctxt->input_rc = APR_EGENERAL;
                 break;
+            } else if (rc == GNUTLS_E_PULL_ERROR
+                       && APR_STATUS_IS_TIMEUP(ctxt->input_rc)) {
+                ap_log_cerror(
+                    APLOG_MARK, APLOG_TRACE2, ctxt->input_rc, ctxt->c,
+                    "%s: transport read timed out", __func__);
             } else {
                 /* Some Other Error. Report it. Die. */
@@ -1004 +1009 @@
         {
             ctxt->input_rc = rc;
-            gnutls_transport_set_errno(ctxt->session, EAGAIN);
+            gnutls_transport_set_errno(ctxt->session, ETIMEDOUT);
             return -1;
         }