From c89dd90491fb8e9ae2c93a9871a3fea214ac3d3f Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 2 Apr 2024 11:19:41 -0400 Subject: [PATCH] Fix httpGets timeout handling (Issue #879) --- CHANGES.md | 1 + cups/http.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index f1e48809d5..0237607369 100644 --- 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 744c1dba2e..29a51e0dc9 100644 --- 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) { -- 2.47.2