The CUPS library did not reuse domain sockets (Issue #5098)

diff --git a/CHANGES.md b/CHANGES.md
index 28965b441e345d80108e7669f5212fbc20177147..84afe8a3184cd1973f1498868c1798cb307cda0d 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,7 @@ CHANGES IN CUPS V2.2.5
 - The IPP Everywhere PPD generator now sorts the supported resolutions before
   choosing them for draft, normal, and best quality modes (Issue #5091)
 - Fixed the localization unit test on Linux (Issue #5097)
+- The CUPS library did not reuse domain sockets (Issue #5098)
 - Fixed an issue with Chinese localizations on macOS (rdar://32419311)
 - The IPP backend now always sends the "finishings" attribute for printers that
   support it because otherwise the client cannot override printer defaults

diff --git a/cups/request.c b/cups/request.c
index 0ab2690aa132bd1b907adca3de4263834fab7b55..f526bf016004140fac9b6555bdcc2027ba9e209c 100644 (file)
--- a/cups/request.c
+++ b/cups/request.c
@@ -998,7 +998,11 @@ _cupsConnect(void)
     */
 
     if (strcmp(cg->http->hostname, cg->server) ||
+#ifdef AF_LOCAL
+        (httpAddrFamily(cg->http->hostaddr) != AF_LOCAL && cg->ipp_port != httpAddrPort(cg->http->hostaddr)) ||
+#else
         cg->ipp_port != httpAddrPort(cg->http->hostaddr) ||
+#endif /* AF_LOCAL */
         (cg->http->encryption != cg->encryption &&
         cg->http->encryption == HTTP_ENCRYPTION_NEVER))
     {