Allow http*Connect to return early if all addresses fail (Issue #4870)

diff --git a/CHANGES.txt b/CHANGES.txt
index ad7c950d89336f98bb0fb0ef6a184dace54dff60..838e96d2bfd0d9279e57d98050b82d0217bfeb37 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.2.0 - 2016-08-26
+CHANGES.txt - 2.2.0 - 2016-09-09
 --------------------------------
 
 CHANGES IN CUPS V2.2.0
@@ -8,6 +8,8 @@ CHANGES IN CUPS V2.2.0
        - http*Connect did not work on Linux when cupsd was not running
          (Issue #4870)
        - The --no-remote-any option of cupsctl had no effect (Issue #4866)
+       - http*Connect did not return early when all addresses failed
+         (Issue #4870)
 
 
 CHANGES IN CUPS V2.2rc1

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index a760602bcc75a761ed3d005c791793a874a29679..6e2ad8196672ac791b4d2bd3d828235e05cdbd49 100644 (file)
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -239,6 +239,9 @@ httpAddrConnect2(
       addrlist = addrlist->next;
     }
 
+    if (!addrlist && nfds == 0)
+      break;
+
    /*
     * See if we can connect to any of the addresses so far...
     */