Changeset 4d38cbd in mod_gnutls


Ignore:
Timestamp:
Jan 3, 2019, 7:24:47 AM (3 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_io.c

    r08c48d7 r4d38cbd  
    682682                          "%s: TLS %sconnection opened.",
    683683                          __func__, IS_PROXY_STR(ctxt));
    684     }
    685 
    686     if (ctxt->status < 0)
    687     {
    688         ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctxt->c,
    689                       "%s: %sconnection failed, refusing to send.",
    690                       __func__, IS_PROXY_STR(ctxt));
    691         if (ctxt->is_proxy)
     684        else if (ctxt->is_proxy)
    692685        {
    693686            /* If mod_proxy receives an error while trying to send its
     
    700693            return APR_SUCCESS;
    701694        }
    702         else
    703             return APR_ECONNABORTED;
     695        /* No final else here, the "ctxt->status < 0" check below will
     696         * catch that. */
     697    }
     698
     699    if (ctxt->status < 0)
     700    {
     701        ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, ctxt->c,
     702                      "%s: %sconnection failed, refusing to send.",
     703                      __func__, IS_PROXY_STR(ctxt));
     704        return APR_ECONNABORTED;
    704705    }
    705706
Note: See TracChangeset for help on using the changeset viewer.