Changeset c3ad933 in mod_gnutls for src/gnutls_io.c

Timestamp:

Jun 3, 2016, 2:31:56 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

8913410

Parents:

fd6bb19

Message:

Remove stale support code for Apache versions before 2.2

File:

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

src/gnutls_io.c

@@ -401 +401 @@
     if (maxtries < 1) {
         ctxt->status = -1;
-#if USING_2_1_RECENT
         ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, ctxt->c,
                 "GnuTLS: Handshake Failed. Hit Maximum Attempts");
-#else
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0,
-                ctxt->c->base_server,
-                "GnuTLS: Handshake Failed. Hit Maximum Attempts");
-#endif
         if (ctxt->session) {
             gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
@@ -437 +431 @@
             goto tryagain;
         }
-#if USING_2_1_RECENT
         ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, ctxt->c,
                 "GnuTLS: Handshake Failed (%d) '%s'", ret,
                 gnutls_strerror(ret));
-#else
-        ap_log_error(APLOG_MARK, APLOG_INFO, 0,
-                ctxt->c->base_server,
-                "GnuTLS: Handshake Failed (%d) '%s'", ret,
-                gnutls_strerror(ret));
-#endif
         ctxt->status = -1;
         if (ctxt->session) {