44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
diff -up cups-2.2.6/cups/http-addrlist.c.cupsgetjobs-pollhup cups-2.2.6/cups/http-addrlist.c
|
|
--- cups-2.2.6/cups/http-addrlist.c.cupsgetjobs-pollhup 2023-12-19 18:25:15.484637450 +0100
|
|
+++ cups-2.2.6/cups/http-addrlist.c 2023-12-19 18:28:57.129163387 +0100
|
|
@@ -313,6 +313,39 @@ httpAddrConnect2(
|
|
{
|
|
# ifdef HAVE_POLL
|
|
DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents));
|
|
+
|
|
+# ifdef _WIN32
|
|
+ if (((WSAGetLastError() == WSAEINPROGRESS) && (pfds[i].revents & POLLIN) && (pfds[i].revents & POLLOUT)) ||
|
|
+ ((pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN|POLLOUT))))
|
|
+# else
|
|
+ if (((errno == EINPROGRESS) && (pfds[i].revents & POLLIN) && (pfds[i].revents & POLLOUT)) ||
|
|
+ ((pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN|POLLOUT))))
|
|
+# endif /* _WIN32 */
|
|
+ {
|
|
+ // Some systems generate POLLIN or POLLOUT together with POLLHUP when doing
|
|
+ // asynchronous connections. The solution seems to be to use getsockopt to
|
|
+ // check the SO_ERROR value and ignore the POLLHUP if there is no error or
|
|
+ // the error is EINPROGRESS.
|
|
+
|
|
+ int sres, /* Return value from getsockopt() - 0, or -1 if error */
|
|
+ serr; /* Option SO_ERROR value */
|
|
+ socklen_t slen = sizeof(serr); /* Option value size */
|
|
+
|
|
+ sres = getsockopt(fds[i], SOL_SOCKET, SO_ERROR, &serr, &slen);
|
|
+
|
|
+ if (sres || serr)
|
|
+ {
|
|
+ pfds[i].revents |= POLLERR;
|
|
+# ifdef DEBUG
|
|
+ DEBUG_printf(("1httpAddrConnect2: getsockopt returned: %d with error: %s", sres, strerror(serr)));
|
|
+# endif
|
|
+ }
|
|
+ else if (pfds[i].revents && (pfds[i].revents & POLLHUP) && (pfds[i].revents & (POLLIN | POLLOUT)))
|
|
+ {
|
|
+ pfds[i].revents &= ~POLLHUP;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP)))
|
|
# else
|
|
if (FD_ISSET(fds[i], &input_set) && !FD_ISSET(fds[i], &error_set))
|