Fix httpGets timeout handling (Issue #879)

diff --git a/CHANGES.md b/CHANGES.md
index f1e48809d51106ba28a3c43b19621d213e6af923..0237607369a153ccf8e474cd6c558d4965a6bffa 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -61,6 +61,7 @@ Changes in CUPS v2.5b1 (TBA)
 - Fixed potential race condition for the creation of temporary queues
   (Issue #871)
 - Fixed Oki 407 freeze when printing larger jobs (Issue #877)
+- Fixed `httpGets` timeout handling (Issue #879)
 - Fixed checking for required attributes during PPD generation (Issue #890)
 - Fixed pwg-raster-document-resolution-supported and urf-supported values
   (Issue #901)

diff --git a/cups/http.c b/cups/http.c
index 744c1dba2ef0e7eeb0b18fd800071d127bb87846..29a51e0dc96ed7aeffe9e7166f24612163148b59 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1091,6 +1091,7 @@ httpGets2(http_t *http,                   // I - HTTP connection
            continue;
 
          http->error = WSAGetLastError();
+         return (NULL);
        }
        else if (WSAGetLastError() != http->error)
        {
@@ -1113,6 +1114,7 @@ httpGets2(http_t *http,                   // I - HTTP connection
            continue;
 
          http->error = errno;
+         return (NULL);
        }
        else if (errno != http->error)
        {