rpms/cups/devel cups-driverd-timeout.patch,1.1,1.2

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11490

Modified Files:
	cups-driverd-timeout.patch 
Log Message:
Rediff driverd-timeout patch.

cups-driverd-timeout.patch:

Index: cups-driverd-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-driverd-timeout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-driverd-timeout.patch	22 Nov 2006 10:48:21 -0000	1.1
+++ cups-driverd-timeout.patch	15 Jul 2008 12:41:21 -0000	1.2
@@ -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)