[git] GnuPG - branch, master, updated. gnupg-2.1.22-3-g482fd57

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  482fd5758c1b7e1b33c4cb50656e586a3ae16815 (commit)
      from  4ad5bc1b6d72483123963c894ee1412b2ceb99b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 482fd5758c1b7e1b33c4cb50656e586a3ae16815
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 31 13:12:37 2017 +0200

    dirmngr,w32: Fix http connection timeout problem.
    
    * dirmngr/http.c (connect_with_timeout) [W32]: Take care of EAGAIN.
    --
    
    GnuPG-bug-id: 3319
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/http.c b/dirmngr/http.c
index 0bedba0..8e778df 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -2750,7 +2750,11 @@ connect_with_timeout (assuan_fd_t sock,
       return 0; /* Success.  */
     }
   err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
-  if (gpg_err_code (err) != GPG_ERR_EINPROGRESS)
+  if (gpg_err_code (err) != GPG_ERR_EINPROGRESS
+#ifdef HAVE_W32_SYSTEM
+      && gpg_err_code (err) != GPG_ERR_EAGAIN
+#endif
+      )
     {
       RESTORE_BLOCKING ();
       return err;

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/http.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org