`httpReconnect2` did not reset the socket file descriptor when the TLS negotiation...

diff --git a/CHANGES.md b/CHANGES.md
index 16576f7371d14bcacc651e61b6eaede57f6c03ff..29fb40ea26e2a2d8929ca29827203c1350b5cffa 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,8 @@ CUPS v2.4rc1 (Pending)
 - Added support for locales using the GB18030 character set (Issue #159)
 - The IPP parser now errors out when reading a member attribute outside a
   collection.
+- `httpReconnect2` did not reset the socket file descriptor when the TLS
+  negotiation failed (Apple #5907)
 - Documentation fixes (Issue #92)
 - Localization updates (Issue #123, Issue #129, Issue #134, Issue #146)
 - USB quirk updates (Apple #5766, Apple #5838, Apple #5843, Apple #5867)

diff --git a/cups/http.c b/cups/http.c
index 371b0cab1150f2c84c65bda655b6dcf738bfa849..a988e1fae4b029e3fc8dbd6dc23c13499967b291 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -2,7 +2,7 @@
  * HTTP routines for CUPS.
  *
  * Copyright © 2021 by OpenPrinting.
- * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 2007-2021 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
  * This file contains Kerberos support code, copyright 2006 by
@@ -2422,6 +2422,7 @@ httpReconnect2(http_t *http,              /* I - HTTP connection */
     if (_httpTLSStart(http) != 0)
     {
       httpAddrClose(NULL, http->fd);
+      http->fd = -1;
 
       return (-1);
     }