only register heartbeat if it is enabled.

diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 6948836347999f3cd56ab0b4ea0ec455f8d561cb..90a4936a8dc53254657bd19970e2bd6e5e51353b 100644 (file)
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -336,9 +336,11 @@ _gnutls_ext_init (void)
     return ret;
 #endif
 
+#ifdef ENABLE_HEARTBEAT
   ret = _gnutls_ext_register (&ext_mod_heartbeat);
   if (ret != GNUTLS_E_SUCCESS)
     return ret;
+#endif
 
   ret = _gnutls_ext_register (&ext_mod_new_record_padding);
   if (ret != GNUTLS_E_SUCCESS)

diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index f5ef39822303cd10f1fe0bd2a270280a3fc7ef69..edbdbf7dd20f5e3ca4370ebb63e30a9a7c710dd1 100644 (file)
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -674,9 +674,11 @@ record_add_to_buffers (gnutls_session_t session,
 
           break;
 
+#ifdef ENABLE_HEARTBEAT
         case GNUTLS_HEARTBEAT:
            ret = _gnutls_heartbeat_handle (session, bufel);
            goto cleanup;
+#endif
 
         case GNUTLS_APPLICATION_DATA:
           if (session->internals.initial_negotiation_completed == 0)