PPD files with "*JobPatchFile: bla" no longer fail to load in relaxed

conformance mode (STR #3747)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9440 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index c087cfec1c9009d316ac48c82feceb5827fa72d1..4aabe755cf85e88d3bd1652681705c8748942e30 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -4,6 +4,8 @@ CHANGES-1.4.txt
 CHANGES IN CUPS V1.4.7
 
        - Documentation changes (STR #3710, STR #3720, STR #3745)
+       - PPD files with "*JobPatchFile: bla" no longer fail to load in relaxed
+         conformance mode (STR #3747)
        - The scheduler generated a bad notify-text string for printer state
          change notifications (STR #3739)
        - The scheduler incorrectly updated printers.conf when it really needed

diff --git a/cups/ppd.c b/cups/ppd.c
index 4da685327e13dad95ab806dcaff57eeee6e47d7a..1173d80aedc40431992118e53b19e070acae80c9 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1204,7 +1204,7 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
         }
       }
 
-      if (!name[0])
+      if (!name[0] && cg->ppd_conform == PPD_CONFORM_STRICT)
       {
        /*
         * Found "*JobPatchFile: string"...