Don't output Content-Type unless we are responding to a "CUPS_GET_PPD"

request...

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

diff --git a/CHANGES-1.2.txt b/CHANGES-1.2.txt
index de8bf752453ac2b90aa25f98c2e4001660de3bc9..0ae2d9ba15afeb0bf4d4876934dea5aa4b85ae7c 100644 (file)
--- a/CHANGES-1.2.txt
+++ b/CHANGES-1.2.txt
@@ -1,6 +1,20 @@
 CHANGES-1.2.txt
 ---------------
 
+CHANGES IN CUPS V1.2.12
+
+       - The web admin interface incorrectly handled the "share
+         printers" and "show remote printers" settings (STR
+         #2393)
+       - The scheduler's log messages about AuthClass and
+         AuthGroupName advised using a replacement directive but
+         had the wrong syntax (STR #2400)
+       - Updated the PostScript/PJL and HP-GL/2 MIME rules to
+         look in the first 4k of the file, not just the first 1k
+         (STR #2386)
+       - Updated the Italian localization (STR #2382)
+
+
 CHANGES IN CUPS V1.2.11
 
        - Fixed the "relaying from" log message (STR #2376)

diff --git a/scheduler/cups-driverd.c b/scheduler/cups-driverd.c
index 931642519c498edcf1bf7b02422a4bd92ad25465..ad39e7469c674110b79856d8f2f6d5f12467493b 100644 (file)
--- a/scheduler/cups-driverd.c
+++ b/scheduler/cups-driverd.c
@@ -299,7 +299,8 @@ cat_ppd(const char *name,           /* I - PPD name */
   else
     scheme[0] = '\0';
 
-  puts("Content-Type: application/ipp\n");
+  if (request_id > 0)
+    puts("Content-Type: application/ipp\n");
 
   if (scheme[0])
   {