Fix httpGets timeout handling (Issue #879)

diff --git a/CHANGES.md b/CHANGES.md
index e84c817fa7845806924b2110b6ce915b1d1d1d08..44f0726aab2319cfc8880ceb480cfc51a03fe9fc 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@ Changes in CUPS v2.4.8 (TBA)
   instead of keywords as `InputSlot` values (Issue #859)
 - Fixed IPP backend to support the "print-scaling" option with IPP printers
   (Issue #862)
+- Fixed `httpGets` timeout handling (Issue #879)
 - Fixed checking for required attributes during PPD generation (Issue #890)
 - Fixed encoding of IPv6 addresses in HTTP requests (Issue #903)
 - Fixed CGI program initialization and validation of form checkbox and text

diff --git a/cups/http.c b/cups/http.c
index a73a83b57e3dc8a8ba550af8c700f41a75cba883..45b95b5e3120e352a23b7f5d2ff6e3093d9a9980 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1221,6 +1221,7 @@ httpGets(char   *line,                    /* I - Line to read into */
            continue;
 
          http->error = WSAGetLastError();
+         return (NULL);
        }
        else if (WSAGetLastError() != http->error)
        {
@@ -1241,6 +1242,7 @@ httpGets(char   *line,                    /* I - Line to read into */
            continue;
 
          http->error = errno;
+         return (NULL);
        }
        else if (errno != http->error)
        {