- Fix from code review, if EINPROGRESS not defined chain if statement differently.

git-svn-id: file:///svn/unbound/trunk@2636 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 0d7b1d44ae30d53d9e706d357985e395874f7273..757f709c8b9a90bbea746dad71b991d44be3c5c3 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+28 February 2012: Wouter
+       - Fix from code review, if EINPROGRESS not defined chain if statement
+         differently.
+
 27 February 2012: Wouter
        - Fix bug#434: on windows check registry for config file location
          for unbound-control.exe, and unbound-checkconf.exe.

diff --git a/util/netevent.c b/util/netevent.c
index 1317e5414731ac83dee82a09769be74a70510735..c026e1dafd396a616ca9d5e357253ecc92a9b822 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1195,8 +1195,9 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 #if defined(EINPROGRESS) && defined(EWOULDBLOCK)
                if(error == EINPROGRESS || error == EWOULDBLOCK)
                        return 1; /* try again later */
+               else
 #endif
-               else if(error != 0 && verbosity < 2)
+               if(error != 0 && verbosity < 2)
                        return 0; /* silence lots of chatter in the logs */
                 else if(error != 0) {
                        log_err("tcp connect: %s", strerror(error));