Fix one other spot where http->fd isn't reset to -1 (Issue #5915)

diff --git a/CHANGES.md b/CHANGES.md
index 5e5f8600a1d7737955d75c44cf2fafb0da1949c4..24c04cea4efca2705844c67474b62f0a8b6a0305 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -72,6 +72,8 @@ Changes in CUPS v2.3.5
 - Fixed a PPD memory leak caused by emulator definitions (OpenPrinting #124)
 - `httpReconnect2` did not reset the socket file descriptor when the TLS
   negotiation failed (Issue #5907)
+- `httpUpdate` did not reset the socket file descriptor when the TLS
+  negotiation failed (Apple #5915)
 - Removed support for the (long deprecated and unused) `KeepAliveTimeout`
   directive in `cupsd.conf` (Issue #5733)
 

diff --git a/cups/http.c b/cups/http.c
index dcc00ac52253f6b50b2c57dc7f8c03b40e4615f2..43ace18f4428f7313809e644dead8b4af81a677a 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -2787,6 +2787,7 @@ _httpUpdate(http_t        *http,  /* I - HTTP connection */
       if (_httpTLSStart(http) != 0)
       {
         httpAddrClose(NULL, http->fd);
+        http->fd = -1;
 
        *status = http->status = HTTP_STATUS_ERROR;
        return (0);