Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11311 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 5ace09b2e34ea57959a425d6181af3f9c59f146b..01c3d1c4032606b2c7ffde9e3463262a824b7a5f 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,13 @@
-CHANGES.txt - 1.7.0 - 2013-08-29
+CHANGES.txt - 1.7.0 - 2013-09-27
 --------------------------------
 
 CHANGES IN CUPS V1.7.0
 
        - Updated Japanese localization.
+       - The scheduler did not remove backup PPD files when a printer was
+         deleted (<rdar://problem/15065555>)
+       - The scheduler incorrectly responded to HEAD requests when the web
+         interface was disabled (<rdar://problem/15090332>)
        - The scheduler did not respond using the hostname specified by the
          client (<rdar://problem/14583574>)
        - Fax queues did not work when shared via Bonjour

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 5a5ed2e22de88f78b9856ec12959127804ec8acd..2c1afe01237ed815713ab21787004d982d64719c 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -5741,10 +5741,16 @@ delete_printer(cupsd_client_t  *con,    /* I - Client connection */
   snprintf(filename, sizeof(filename), "%s/interfaces/%s", ServerRoot,
            printer->name);
   unlink(filename);
+  snprintf(filename, sizeof(filename), "%s/interfaces/%s.O", ServerRoot,
+           printer->name);
+  unlink(filename);
 
   snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot,
            printer->name);
   unlink(filename);
+  snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd.O", ServerRoot,
+           printer->name);
+  unlink(filename);
 
   snprintf(filename, sizeof(filename), "%s/%s.png", CacheDir, printer->name);
   unlink(filename);