Re: Emacs on windows and GnuTLS

[Ted Zlatanov <tzz@lifelogs.com>]

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

Thanks for the review, Fabrice.

Anticipating the need for more of these special cases, here's a
switch-based approach that avoids special variables and makes the level
explicit in each case.  It's easier to read, too.  Let me know if this
works for you and I will install it.

Ted


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnutls.eagain-lower.patch --]
[-- Type: text/x-diff, Size: 719 bytes --]

=== modified file 'src/gnutls.c'
--- src/gnutls.c	2013-11-04 06:09:03 +0000
+++ src/gnutls.c	2013-11-04 16:16:31 +0000
@@ -488,8 +488,20 @@
   else
     {
       ret = 1;
-      GNUTLS_LOG2 (1, max_log_level, "non-fatal error:", str);
-      /* TODO: EAGAIN AKA Qgnutls_e_again should be level 2.  */
+
+      switch (err)
+        {
+        case GNUTLS_E_AGAIN:
+          GNUTLS_LOG2 (3,
+                       max_log_level,
+                       "retry:",
+                       str);
+        default:
+          GNUTLS_LOG2 (1,
+                       max_log_level,
+                       "non-fatal error:",
+                       str);
+        }
     }
 
   if (err == GNUTLS_E_WARNING_ALERT_RECEIVED