Compare commits
1 Commits
da6173cb74
...
da4d7ff6c7
Author | SHA1 | Date | |
---|---|---|---|
|
da4d7ff6c7 |
1
.cups.metadata
Normal file
1
.cups.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
23108e0f6ca7d8caa1a6a6224f5322e21ba0a27d cups-2.3.3op2-source.tar.gz
|
@ -0,0 +1,43 @@
|
|||||||
|
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))
|
@ -130,6 +130,8 @@ Patch36: 0001-Require-authentication-for-CUPS-Get-Document.patch
|
|||||||
Patch37: cups-preservejobfiles-leak.patch
|
Patch37: cups-preservejobfiles-leak.patch
|
||||||
# RHEL-15308 cupsd fails to open cups-files.conf and the resulting error message is lost
|
# RHEL-15308 cupsd fails to open cups-files.conf and the resulting error message is lost
|
||||||
Patch38: 0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch
|
Patch38: 0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch
|
||||||
|
# RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
||||||
|
Patch39: 0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch
|
||||||
|
|
||||||
|
|
||||||
##### Patches removed because IMHO they aren't no longer needed
|
##### Patches removed because IMHO they aren't no longer needed
|
||||||
@ -399,6 +401,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
|
|||||||
%patch37 -p1 -b .preservejobfiles-leak
|
%patch37 -p1 -b .preservejobfiles-leak
|
||||||
# RHEL-15308 cupsd fails to open cups-files.conf and the resulting error message is lost
|
# RHEL-15308 cupsd fails to open cups-files.conf and the resulting error message is lost
|
||||||
%patch38 -p1 -b .log-stderr
|
%patch38 -p1 -b .log-stderr
|
||||||
|
# RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
||||||
|
%patch39 -p1 -b .cupsgetjobs-pollhup
|
||||||
|
|
||||||
%if %{lspp}
|
%if %{lspp}
|
||||||
# LSPP support.
|
# LSPP support.
|
||||||
@ -835,6 +839,7 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%changelog
|
%changelog
|
||||||
* Wed Dec 20 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-23
|
* Wed Dec 20 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-23
|
||||||
- RHEL-19205 Recommend new cups-filters subpackages with weak dep for better upgrade exp
|
- RHEL-19205 Recommend new cups-filters subpackages with weak dep for better upgrade exp
|
||||||
|
- RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
||||||
|
|
||||||
* Thu Nov 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-22
|
* Thu Nov 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-22
|
||||||
- RHEL-14931 cupsd memory leak in cupsdDeleteJob() with "PreserveJobHistory Off"
|
- RHEL-14931 cupsd memory leak in cupsdDeleteJob() with "PreserveJobHistory Off"
|
||||||
|
Loading…
Reference in New Issue
Block a user