Re: Fgnutls_available_p: Avoid duplicating capabilities.

[Juanma Barranquero <lekktu@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1317 bytes --]

Oops, braino. I accidentally moved the #ifdef HAVE_GNUTLS_EXT__DUMBFW block
inside the HAVE_GNUTLS3 one.

Corrected patch:


diff --git i/src/gnutls.c w/src/gnutls.c
index a0de0238c4..5ee5c984a7 100644
--- i/src/gnutls.c
+++ w/src/gnutls.c
@@ -2791,4 +2791,8 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p,
Sgnutls_available_p, 0, 0, 0,
   capabilities = Fcons (intern("gnutls"), capabilities);

+#  ifdef HAVE_GNUTLS_EXT__DUMBFW
+  capabilities = Fcons (intern("ClientHello Padding"), capabilities);
+#  endif
+
 # ifdef HAVE_GNUTLS3
   capabilities = Fcons (intern("gnutls3"), capabilities);
@@ -2808,5 +2812,7 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p,
Sgnutls_available_p, 0, 0, 0,
       if (name != NULL)
         {
-          capabilities = Fcons (intern(name), capabilities);
+          Lisp_Object cap = intern (name);
+          if (NILP (Fmemq (cap, capabilities)))
+            capabilities = Fcons (intern(name), capabilities);
         }
     }
@@ -2814,8 +2820,4 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p,
Sgnutls_available_p, 0, 0, 0,
 # endif  /* HAVE_GNUTLS3 */

-#  ifdef HAVE_GNUTLS_EXT__DUMBFW
-  capabilities = Fcons (intern("ClientHello Padding"), capabilities);
-#  endif
-
 # ifdef WINDOWSNT
   Vlibrary_cache = Fcons (Fcons (Qgnutls, capabilities), Vlibrary_cache);

[-- Attachment #2: Type: text/html, Size: 1827 bytes --]