Increase web interface get-devices timeout to 10s (bug #996664).
Resolves: rhbz#996664
(cherry picked from commit ae71d87ad6
)
This commit is contained in:
parent
79bffad690
commit
87fad28bb7
19
cups-web-devices-timeout.patch
Normal file
19
cups-web-devices-timeout.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff -up cups-1.7rc1/cgi-bin/admin.c.web-devices-timeout cups-1.7rc1/cgi-bin/admin.c
|
||||||
|
--- cups-1.7rc1/cgi-bin/admin.c.web-devices-timeout 2013-05-29 12:51:34.000000000 +0100
|
||||||
|
+++ cups-1.7rc1/cgi-bin/admin.c 2013-08-16 16:01:17.308264287 +0100
|
||||||
|
@@ -1019,13 +1019,13 @@ do_am_printer(http_t *http, /* I - HTTP
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
- * Scan for devices for up to 30 seconds...
|
||||||
|
+ * Scan for devices for up to 10 seconds...
|
||||||
|
*/
|
||||||
|
|
||||||
|
fputs("DEBUG: Getting list of devices...\n", stderr);
|
||||||
|
|
||||||
|
current_device = 0;
|
||||||
|
- if (cupsGetDevices(http, 5, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE,
|
||||||
|
+ if (cupsGetDevices(http, 10, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE,
|
||||||
|
(cups_device_cb_t)choose_device_cb,
|
||||||
|
(void *)title) == IPP_OK)
|
||||||
|
{
|
@ -11,7 +11,7 @@ Summary: CUPS printing system
|
|||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.6.3
|
Version: 1.6.3
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
Url: http://www.cups.org/
|
Url: http://www.cups.org/
|
||||||
@ -65,6 +65,7 @@ Patch34: cups-avahi-no-threaded.patch
|
|||||||
Patch35: cups-gz-crc.patch
|
Patch35: cups-gz-crc.patch
|
||||||
Patch36: cups-ipp-multifile.patch
|
Patch36: cups-ipp-multifile.patch
|
||||||
Patch37: cups-full-relro.patch
|
Patch37: cups-full-relro.patch
|
||||||
|
Patch38: cups-web-devices-timeout.patch
|
||||||
|
|
||||||
Patch100: cups-lspp.patch
|
Patch100: cups-lspp.patch
|
||||||
|
|
||||||
@ -254,6 +255,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
%patch36 -p1 -b .ipp-multifile
|
%patch36 -p1 -b .ipp-multifile
|
||||||
# Full relro (bug #996740).
|
# Full relro (bug #996740).
|
||||||
%patch37 -p1 -b .full-relro
|
%patch37 -p1 -b .full-relro
|
||||||
|
# Increase web interface get-devices timeout to 10s (bug #996664).
|
||||||
|
%patch38 -p1 -b .web-devices-timeout
|
||||||
|
|
||||||
%if %lspp
|
%if %lspp
|
||||||
# LSPP support.
|
# LSPP support.
|
||||||
@ -640,6 +643,9 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man5/ipptoolfile.5.gz
|
%{_mandir}/man5/ipptoolfile.5.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 16 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-7
|
||||||
|
- Increase web interface get-devices timeout to 10s (bug #996664).
|
||||||
|
|
||||||
* Thu Aug 15 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-6
|
* Thu Aug 15 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-6
|
||||||
- Build with full read-only relocations (bug #996740).
|
- Build with full read-only relocations (bug #996740).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user