Changeset 02a6a18 in mod_gnutls

Timestamp:

Nov 11, 2015, 8:34:01 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

f5a36ee

Parents:

a61edfd

Message:

gnutls_io.c: Don't mix EAGAIN and EINTR in mgs_transport_read

Properly distinguishing EAGAIN and EINTR should help with connection
status handling. Previously EINTR was passed to GnuTLS on APR_EINTR and
APR_EAGAIN alike.

File:

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

src/gnutls_io.c

@@ -41 +41 @@
 #define IS_PROXY_STR(c) \
     ((c->is_proxy == GNUTLS_ENABLED_TRUE) ? "proxy " : "")
+
+/**
+ * Convert APR_EINTR or APR_EAGAIN to the match raw error code. Needed
+ * to pass the status on to GnuTLS from the pull function.
+ */
+#define EAI_APR_TO_RAW(s) (APR_STATUS_IS_EAGAIN(s) ? EAGAIN : EINTR)
+
+
 
 static apr_status_t gnutls_io_filter_error(ap_filter_t * f,
@@ -725 +733 @@
 }
 
+/**
+ * Pull function for GnuTLS
+ */
 ssize_t mgs_transport_read(gnutls_transport_ptr_t ptr,
-        void *buffer, size_t len) {
+                           void *buffer, size_t len)
+{
     mgs_handle_t *ctxt = ptr;
     apr_status_t rc;
@@ -752 +764 @@
          */
         if (APR_STATUS_IS_EAGAIN(rc) || APR_STATUS_IS_EINTR(rc)
-                || (rc == APR_SUCCESS
-                && APR_BRIGADE_EMPTY(ctxt->input_bb))) {
-
-            if (APR_STATUS_IS_EOF(ctxt->input_rc)) {
+            || (rc == APR_SUCCESS
+                && APR_BRIGADE_EMPTY(ctxt->input_bb)))
+        {
+            if (APR_STATUS_IS_EOF(ctxt->input_rc))
+            {
                 return 0;
-            } else {
+            }
+            else
+            {
                 if (ctxt->session)
-                    gnutls_transport_set_errno(ctxt->
-                        session,
-                        EINTR);
+                    gnutls_transport_set_errno(ctxt->session,
+                                               EAI_APR_TO_RAW(ctxt->input_rc));
                 return -1;
             }
         }
-
 
         if (rc != APR_SUCCESS) {
@@ -783 +796 @@
 
     if (APR_STATUS_IS_EAGAIN(ctxt->input_rc)
-            || APR_STATUS_IS_EINTR(ctxt->input_rc)) {
-        if (len == 0) {
+        || APR_STATUS_IS_EINTR(ctxt->input_rc))
+    {
+        if (len == 0)
+        {
             if (ctxt->session)
                 gnutls_transport_set_errno(ctxt->session,
-                    EINTR);
+                                           EAI_APR_TO_RAW(ctxt->input_rc));
             return -1;
         }