From 4ecc3203643cfdd17e3e3326d6a13ac06e8a1050 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 27 Sep 2013 14:23:42 +0000 Subject: [PATCH] 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 --- CHANGES.txt | 6 +++++- scheduler/ipp.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5ace09b2e3..01c3d1c403 100644 --- 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 () + - The scheduler incorrectly responded to HEAD requests when the web + interface was disabled () - The scheduler did not respond using the hostname specified by the client () - Fax queues did not work when shared via Bonjour diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 5a5ed2e22d..2c1afe0123 100644 --- 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); -- 2.47.2