From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 23 Apr 2007 17:33:45 +0000 (+0000)
Subject: Fix IPP printing for Xerox printers (STR #2349)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cad2b75f3b98e1cdb2e149ee7f99233fecafe739;p=thirdparty%2Fcups.git

Fix IPP printing for Xerox printers (STR #2349)


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

diff --git a/backend/ipp.c b/backend/ipp.c
index 460332286e..0053d6b9d1 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -101,6 +101,7 @@ main(int  argc,				/* I - Number of command-line args */
      char *argv[])			/* I - Command-line arguments */
 {
   int		i;			/* Looping var */
+  int		send_options;		/* Send job options? */
   int		num_options;		/* Number of printer options */
   cups_option_t	*options;		/* Printer options */
   char		method[255],		/* Method in URI */
@@ -432,6 +433,8 @@ main(int  argc,				/* I - Number of command-line args */
     filename  = tmpfilename;
     files     = &filename;
     num_files = 1;
+
+    send_options = 0;
   }
   else
   {
@@ -442,6 +445,8 @@ main(int  argc,				/* I - Number of command-line args */
     num_files = argc - 6;
     files     = argv + 6;
 
+    send_options = strncasecmp(content_type, "application/vnd.cups-", 21) != 0;
+
 #ifdef HAVE_LIBZ
     if (compression)
       compress_files(num_files, files);
@@ -928,6 +933,7 @@ main(int  argc,				/* I - Number of command-line args */
 	content_type     = "application/postscript";
 	copies           = 1;
 	copies_remaining = 1;
+        send_options     = 0;
       }
     }
 #endif /* __APPLE__ */
@@ -943,7 +949,7 @@ main(int  argc,				/* I - Number of command-line args */
 	                            num_options, &options);
     }
 
-    if (copies_sup && version > 0)
+    if (copies_sup && version > 0 && send_options)
     {
      /*
       * Only send options if the destination printer supports the copies