Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3449 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 78c3e5473dc3aff6cbdf4a29b0a74684683e204f..6d86aac6f2af31256298a0126551336922184765 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - If the scheduler was unable to execute a filter, it
+         would try to restart the job indefinitely until the
+         filter could be executed.
        - When writing BSD printcap files, the scheduler now
          includes the rm and rp attributes, allowing the file
          to be exported to LPD clients. [Patch from Dominic

diff --git a/scheduler/job.c b/scheduler/job.c
index 52992ecc3c7237431105d2102a37a16e3632f023..1f03360231cf7d9c24be595368bc8324d7816c80 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c,v 1.124.2.51 2003/03/10 15:05:53 mike Exp $"
+ * "$Id: job.c,v 1.124.2.52 2003/03/12 16:16:32 mike Exp $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -1795,6 +1795,11 @@ StartJob(int       id,           /* I - Job ID */
       snprintf(printer->state_message, sizeof(printer->state_message),
                "Unable to start filter \"%s\" - %s.",
                filters[i].filter, strerror(errno));
+
+      if (filters != NULL)
+       free(filters);
+
+      CancelJob(current->id, 0);
       return;
     }
 
@@ -1868,6 +1873,7 @@ StartJob(int       id,            /* I - Job ID */
        current->back_pipes[0] = -1;
        current->back_pipes[1] = -1;
 
+        CancelJob(current->id, 0);
        return;
       }
       else
@@ -2614,5 +2620,5 @@ start_process(const char *command,        /* I - Full path to command */
 
 
 /*
- * End of "$Id: job.c,v 1.124.2.51 2003/03/10 15:05:53 mike Exp $".
+ * End of "$Id: job.c,v 1.124.2.52 2003/03/12 16:16:32 mike Exp $".
  */