rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Increase client blocking timeout from 30s to 70s (bug #744715).

Browse Source
This commit is contained in:
Tim Waugh 2011-10-10 17:05:55 +01:00
parent 0928f7c050
commit 6085d5e059
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cups-driverd-timeout.patch
View File

@ -1,7 +1,19 @@
diff -up cups-1.5b1/scheduler/ipp.c.driverd-timeout cups-1.5b1/scheduler/ipp.c diff -up cups-1.5.0/cups/http.c.driverd-timeout cups-1.5.0/cups/http.c
--- cups-1.5b1/scheduler/ipp.c.driverd-timeout 2011-05-24 15:44:55.000000000 +0200 --- cups-1.5.0/cups/http.c.driverd-timeout 2011-10-10 17:03:54.181458460 +0100
+++ cups-1.5b1/scheduler/ipp.c 2011-05-24 15:44:56.000000000 +0200 +++ cups-1.5.0/cups/http.c 2011-10-10 17:04:01.452321912 +0100
@@ -5720,7 +5720,7 @@ copy_model(cupsd_client_t *con, /* I - @@ -1314,7 +1314,7 @@ httpGets(char *line, /* I - Line to
* No newline; see if there is more data to be read...
*/
- while (!_httpWait(http, http->blocking ? 30000 : 10000, 1))
+ while (!_httpWait(http, http->blocking ? 70000 : 10000, 1))
{
if (http->timeout_cb && (*http->timeout_cb)(http, http->timeout_data))
continue;
diff -up cups-1.5.0/scheduler/ipp.c.driverd-timeout cups-1.5.0/scheduler/ipp.c
--- cups-1.5.0/scheduler/ipp.c.driverd-timeout 2011-10-10 17:03:41.801690962 +0100
+++ cups-1.5.0/scheduler/ipp.c 2011-10-10 17:03:41.861689834 +0100
@@ -5723,7 +5723,7 @@ copy_model(cupsd_client_t *con, /* I -
close(temppipe[1]); close(temppipe[1]);
/* /*
@ -10,7 +22,7 @@ diff -up cups-1.5b1/scheduler/ipp.c.driverd-timeout cups-1.5b1/scheduler/ipp.c
*/ */
total = 0; total = 0;
@@ -5740,7 +5740,7 @@ copy_model(cupsd_client_t *con, /* I - @@ -5743,7 +5743,7 @@ copy_model(cupsd_client_t *con, /* I -
FD_SET(temppipe[0], &input); FD_SET(temppipe[0], &input);
FD_SET(CGIPipes[0], &input); FD_SET(CGIPipes[0], &input);

1
cups.spec
View File

@ -647,6 +647,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Oct 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-16 * Mon Oct 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-16
- Increase client blocking timeout from 30s to 70s (bug #744715).
- Set BindIPv6Only=ipv6-only in systemd socket unit file as better fix - Set BindIPv6Only=ipv6-only in systemd socket unit file as better fix
for bug #737230. for bug #737230.