Merge changes from CUPS 1.6svn-r10390.

[thirdparty/cups.git] / cups / http.c

diff --git a/cups/http.c b/cups/http.c
index 1f2d826dda209811923a586c0183ff8be427fc81..b95baa9d06c4c0b998cf4a2950066336bb492b55 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -4163,7 +4163,8 @@ http_setup_ssl(http_t *http)              /* I - Connection to server */
            break;
 
        case errSSLWouldBlock :
-           usleep(1000);
+           error = noErr;              /* Force a retry */
+           usleep(1000);               /* in 1 millisecond */
            break;
 
 #    ifdef HAVE_SECCERTIFICATECOPYDATA
@@ -4199,7 +4200,7 @@ http_setup_ssl(http_t *http)              /* I - Connection to server */
                  {
                    data = (CFDataRef)CFArrayGetValueAtIndex(dn_array, i);
 
-                   if ((credential = malloc(sizeof(*credential))))
+                   if ((credential = malloc(sizeof(*credential))) != NULL)
                    {
                      credential->datalen = CFDataGetLength(data);
                      if ((credential->data = malloc(credential->datalen)))
@@ -4520,7 +4521,8 @@ http_write(http_t     *http,              /* I - Connection to server */
        pfd.events = POLLOUT;
 
        while ((nfds = poll(&pfd, 1, http->wait_value)) < 0 &&
-              (errno == EINTR || errno == EAGAIN));
+              (errno == EINTR || errno == EAGAIN))
+         /* do nothing */;
 
 #else
        do