rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- The web interface did not show completed jobs (STR #3436).

Browse Source
This commit is contained in:
Tim Waugh 2009-12-08 12:21:52 +00:00
parent 3fff9e87cb
commit 03bef5ab90
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cups-str3436.patch Normal file
View File

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

3
cups.spec
View File

@ -68,6 +68,7 @@ Patch41: cups-negative-snmp-string-length.patch
Patch42: cups-sidechannel-intrs.patch Patch42: cups-sidechannel-intrs.patch
Patch43: cups-media-empty-warning.patch Patch43: cups-media-empty-warning.patch
Patch44: cups-str3435.patch Patch44: cups-str3435.patch
Patch45: cups-str3436.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -241,6 +242,7 @@ module.
%patch42 -p1 -b .sidechannel-intrs %patch42 -p1 -b .sidechannel-intrs
%patch43 -p1 -b .media-empty-warning %patch43 -p1 -b .media-empty-warning
%patch44 -p1 -b .str3435 %patch44 -p1 -b .str3435
%patch45 -p1 -b .str3436
%if %lspp %if %lspp
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -540,6 +542,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Dec 8 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-14 * Tue Dec 8 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-14
- The web interface did not show completed jobs (STR #3436).
- Authenticated printing did not always work when printing directly to - Authenticated printing did not always work when printing directly to
a remote server (STR #3435). a remote server (STR #3435).
- Use upstream patch to stop the network backends incorrectly clearing - Use upstream patch to stop the network backends incorrectly clearing