diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-02-25 23:37:25 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-02-25 23:37:25 +0000 |
| commit | b9faaae17cfc7cd8dfd6e82cf607c05b2f4def68 (patch) | |
| tree | 11ae14d6d1fc0cd6d834e8c819b74167dbe2a413 /cgi-bin | |
| parent | ede613e028030f6b2b5871b5e40682806ee1acd0 (diff) | |
| download | cups-b9faaae17cfc7cd8dfd6e82cf607c05b2f4def68.tar.gz | |
Merge changes from CUPS 1.4svn-r8394.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1253 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cgi-bin')
| -rw-r--r-- | cgi-bin/ipp-var.c | 4 | ||||
| -rw-r--r-- | cgi-bin/var.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index fd1b5be1b..4048dd605 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1406,8 +1406,8 @@ cgiShowJobs(http_t *http, /* I - Connection to server */ NULL, url); } else - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, - "ipp://localhost/jobs"); + ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, + "ipp://localhost/"); if ((which_jobs = cgiGetVariable("which_jobs")) != NULL) ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs", diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 164144a27..6470fcbfd 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -3,7 +3,7 @@ * * CGI form variable and array functions. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2009 by Apple Inc. * Copyright 1997-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -148,9 +148,6 @@ cgiGetArray(const char *name, /* I - Name of array variable */ if ((var = cgi_find_variable(name)) == NULL) return (NULL); - if (var->nvalues == 1) - return (var->values[0]); - if (element < 0 || element >= var->nvalues) return (NULL); |