From 245606c74dc045766722266b2391e052be98624b Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 15 Jul 2008 12:41:21 +0000 Subject: [PATCH] Rediff driverd-timeout patch. --- cups-driverd-timeout.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cups-driverd-timeout.patch b/cups-driverd-timeout.patch index b4cbe39..222fb09 100644 --- a/cups-driverd-timeout.patch +++ b/cups-driverd-timeout.patch @@ -1,6 +1,7 @@ ---- cups-1.2.7/scheduler/ipp.c.driverd-timeout 2006-11-22 10:41:28.000000000 +0000 -+++ cups-1.2.7/scheduler/ipp.c 2006-11-22 10:45:55.000000000 +0000 -@@ -4175,7 +4175,7 @@ +diff -up cups-1.3.7/scheduler/ipp.c.driverd-timeout cups-1.3.7/scheduler/ipp.c +--- cups-1.3.7/scheduler/ipp.c.driverd-timeout 2008-07-15 13:40:51.000000000 +0100 ++++ cups-1.3.7/scheduler/ipp.c 2008-07-15 13:40:51.000000000 +0100 +@@ -4293,7 +4293,7 @@ copy_model(cupsd_client_t *con, /* I - close(temppipe[1]); /* @@ -9,12 +10,12 @@ */ total = 0; -@@ -4196,7 +4196,7 @@ - FD_SET(temppipe[0], input); - FD_SET(CGIPipes[0], input); +@@ -4315,7 +4315,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) + if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0)