|
 |
587ec4e |
diff -up cups-1.4.2/cgi-bin/ipp-var.c.str3436 cups-1.4.2/cgi-bin/ipp-var.c
|
|
|
587ec4e |
--- cups-1.4.2/cgi-bin/ipp-var.c.str3436 2009-11-09 23:01:17.000000000 +0000
|
|
|
587ec4e |
+++ cups-1.4.2/cgi-bin/ipp-var.c 2009-12-08 12:19:01.988500453 +0000
|
|
|
587ec4e |
@@ -333,7 +333,7 @@ cgiMoveJobs(http_t *http, /* I - Co
|
|
|
587ec4e |
NULL, job_uri);
|
|
|
587ec4e |
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
|
|
587ec4e |
"requested-attributes", NULL, "job-printer-uri");
|
|
|
587ec4e |
-
|
|
|
587ec4e |
+
|
|
|
587ec4e |
if ((response = cupsDoRequest(http, request, "/")) != NULL)
|
|
|
587ec4e |
{
|
|
|
587ec4e |
if ((attr = ippFindAttribute(response, "job-printer-uri",
|
|
|
587ec4e |
@@ -926,7 +926,7 @@ cgiRewriteURL(const char *uri, /* I - C
|
|
|
587ec4e |
ishttps ? "https" : "http",
|
|
|
587ec4e |
userpass, hostname, port, resource);
|
|
|
587ec4e |
else
|
|
|
587ec4e |
- snprintf(url, urlsize, "%s://%s:%d%s",
|
|
|
587ec4e |
+ snprintf(url, urlsize, "%s://%s:%d%s",
|
|
|
587ec4e |
ishttps ? "https" : "http",
|
|
|
587ec4e |
hostname, port, resource);
|
|
|
587ec4e |
}
|
|
|
587ec4e |
@@ -1518,7 +1518,11 @@ cgiShowJobs(http_t *http, /* I - Co
|
|
|
587ec4e |
*/
|
|
|
587ec4e |
|
|
|
587ec4e |
if (dest)
|
|
|
587ec4e |
+ {
|
|
|
587ec4e |
snprintf(val, sizeof(val), "/%s/%s", section, dest);
|
|
|
587ec4e |
+ cgiSetVariable("PRINTER_NAME", dest);
|
|
|
587ec4e |
+ cgiSetVariable("PRINTER_URI_SUPPORTED", val);
|
|
|
587ec4e |
+ }
|
|
|
587ec4e |
else
|
|
|
587ec4e |
strlcpy(val, "/jobs/", sizeof(val));
|
|
|
587ec4e |
|