diff options
| author | Remi Collet <fedora@famillecollet.com> | 2011-12-27 16:50:50 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2011-12-27 16:50:50 +0100 |
| commit | 65608e0f8bbc0190cc1b7646f653e796c807f02b (patch) | |
| tree | 274ade8f5007bd7f9c252d8262637e0300363e82 /cups-driverd-timeout.patch | |
import cups from F16
Diffstat (limited to 'cups-driverd-timeout.patch')
| -rw-r--r-- | cups-driverd-timeout.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/cups-driverd-timeout.patch b/cups-driverd-timeout.patch new file mode 100644 index 0000000..fac583b --- /dev/null +++ b/cups-driverd-timeout.patch @@ -0,0 +1,33 @@ +diff -up cups-1.5.0/cups/http.c.driverd-timeout cups-1.5.0/cups/http.c +--- cups-1.5.0/cups/http.c.driverd-timeout 2011-10-10 17:03:54.181458460 +0100 ++++ cups-1.5.0/cups/http.c 2011-10-10 17:04:01.452321912 +0100 +@@ -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]); + + /* +- * Wait up to 30 seconds for the PPD file to be copied... ++ * Wait up to 70 seconds for the PPD file to be copied... + */ + + total = 0; +@@ -5743,7 +5743,7 @@ copy_model(cupsd_client_t *con, /* I - + FD_SET(temppipe[0], &input); + FD_SET(CGIPipes[0], &input); + +- timeout.tv_sec = 30; ++ timeout.tv_sec = 70; + timeout.tv_usec = 0; + + if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) |