Merge changes from CUPS 1.5svn-r9313.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2683 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 13 insertions, 0 deletions

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index ddf8079b4..14406427d 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -102,6 +102,16 @@ httpAddrConnect(
     setsockopt(*sock, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
 #endif /* SO_NOSIGPIPE */
 
+#ifdef __APPLE__
+   /*
+    * Use a 30-second read timeout when connecting to limit the amount of time
+    * we block...
+    */
+
+    val = 30;
+    setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &val, sizeof(val));
+#endif /* __APPLE__ */
+
    /*
     * Using TCP_NODELAY improves responsiveness, especially on systems
     * with a slow loopback interface...
@@ -154,6 +164,9 @@ httpAddrConnect(
     addrlist = addrlist->next;
   }
 
+  if (!addrlist)
+    _cupsSetError(HTTP_SERVICE_UNAVAILABLE, _("Unable to connect to server"), 1);
+
   return (addrlist);
 }