[Pkg-gnupg-commit] [gnupg2] 03/34: dirmngr, w32: Fix http connection timeout problem.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

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>
---
 dirmngr/http.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git