diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-01-23 22:36:42 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-01-23 22:36:42 +0000 |
| commit | d1c13e168660dfc384ead2efe29eb20a7abc5950 (patch) | |
| tree | af85fff369a6092b78c7e3c694784cd7207f1c1c /cups/util.c | |
| parent | d2354e63977f1d0386a8d5724db2ec90fb666824 (diff) | |
| download | cups-d1c13e168660dfc384ead2efe29eb20a7abc5950.tar.gz | |
Merge changes from CUPS 1.4svn-r8290.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1144 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/util.c')
| -rw-r--r-- | cups/util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cups/util.c b/cups/util.c index 30c0f5490..57340e6a9 100644 --- a/cups/util.c +++ b/cups/util.c @@ -3,7 +3,7 @@ * * Printing utilities for the Common UNIX Printing System (CUPS). * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2009 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -951,7 +951,8 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL struct stat ppdinfo; /* PPD file information */ - snprintf(ppdname, sizeof(ppdname), "%s/%s.ppd", cg->cups_serverroot, name); + snprintf(ppdname, sizeof(ppdname), "%s/ppd/%s.ppd", cg->cups_serverroot, + name); if (!stat(ppdname, &ppdinfo)) { /* @@ -1030,7 +1031,7 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL } } - if (*modtime <= ppdinfo.st_mtime) + if (*modtime >= ppdinfo.st_mtime) return (HTTP_NOT_MODIFIED); else { |