From c5b24bfa983a8b50262d8c3dd037e0181cfaae61 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 20 Feb 2013 15:22:35 +0000 Subject: [PATCH] Merge changes from CUPS 1.7svn-r10874. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4189 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-1.6.txt | 7 ++++- CHANGES-IPPTOOL.txt | 13 +++++++- backend/ipp.c | 11 ++++++- cups/ipp-support.c | 7 +++++ cups/util.c | 10 +++--- scheduler/colorman.c | 4 +-- scheduler/cupsfilter.c | 7 +++-- scheduler/ipp.c | 10 +++--- scheduler/testmime.c | 4 +-- test/ipp-1.1.test | 68 ++++++++++++++++++++-------------------- test/ipp-everywhere.test | 32 +++++++++---------- 11 files changed, 104 insertions(+), 69 deletions(-) diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt index 2ed8f7293..c679ce737 100644 --- a/CHANGES-1.6.txt +++ b/CHANGES-1.6.txt @@ -12,6 +12,11 @@ CHANGES IN CUPS V1.6.2 - Added a French localization (STR #4247) - Added a Russian localization (STR #4228) - Updated the Catalan localization (STR #4202) + - cupsGetPPD did not work with statically-configured CUPS shared + queues (STR #4178) + - The scheduler did not support long MIME media types (STR #4270) + - The cupsfilter command did not set the CHARSET environment variable + for the text filters (STR #4273) - The lp command did not show errors for unknown "--foo" (STR #4261) - Bad IPP responses could crash ipptool (STR #4262) - Updated USB quirk rules for Canon and Xerox printers (STR #4217, @@ -24,7 +29,7 @@ CHANGES IN CUPS V1.6.2 - Fixed a problem with local Kerberos authentication (STR #4140) - Coverity scan: fixed some minor issues (STR #4242) - The scheduler did not remove color profiles after deleting a printer - (STR #4232) + (STR #4232, STR #4276) - The CUPS library did not always detect a timed out connection to the server which could cause temporary loss of printing from applications (STR #4187) diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt index f5a7c45a4..2efec97c0 100644 --- a/CHANGES-IPPTOOL.txt +++ b/CHANGES-IPPTOOL.txt @@ -1,10 +1,21 @@ -CHANGES-IPPTOOL.txt - 2013-01-31 +CHANGES-IPPTOOL.txt - 2013-02-20 -------------------------------- This file provides a list of changes to the ipptool binary distribution posted on cups.org. +2013-02-nn + + - The IPP/1.1 test file did not allow for sufficient retries when + printing. + - The IPP/1.1 test file did not allow for empty printer-name values. + - The IPP Everywhere test file contained numerous errors. + - The color.jpg test file used a progressive mode instead of the + baseline JPEG mode. + - The IPP/1.1 test file referenced "color.jpeg" instead of "color.jpg". + + 2013-01-31 - Added support for DEFINE-MATCH and DEFINE-NO-MATCH as STATUS diff --git a/backend/ipp.c b/backend/ipp.c index ff06a4bad..8eed33067 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -262,6 +262,7 @@ main(int argc, /* I - Number of command-line args */ ipp_attribute_t *copies_sup; /* copies-supported */ ipp_attribute_t *cups_version; /* cups-version */ ipp_attribute_t *format_sup; /* document-format-supported */ + ipp_attribute_t *job_auth; /* job-authorization-uri */ ipp_attribute_t *media_col_sup; /* media-col-supported */ ipp_attribute_t *operations_sup; /* operations-supported */ ipp_attribute_t *doc_handling_sup; /* multiple-document-handling-supported */ @@ -1402,13 +1403,21 @@ main(int argc, /* I - Number of command-line args */ copies_sup ? copies : 1, document_format, pc, ppd, media_col_sup, doc_handling_sup, print_color_mode); - ippDelete(cupsDoRequest(http, request, resource)); + response = cupsDoRequest(http, request, resource); ipp_status = cupsLastError(); fprintf(stderr, "DEBUG: Validate-Job: %s (%s)\n", ippErrorString(ipp_status), cupsLastErrorString()); + if ((job_auth = ippFindAttribute(response, "job-authorization-uri", + IPP_TAG_URI)) != NULL) + num_options = cupsAddOption("job-authorization-uri", + ippGetString(job_auth, 0, NULL), num_options, + &options); + + ippDelete(response); + if (job_canceled) break; diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 8417c2c03..06d22bd0a 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1437,6 +1437,11 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "job-resolvers-supported", "job-settable-attributes-supported", "job-spooling-supported", + "jpeg-k-octets-supported", /* CUPS extension */ + "jpeg-x-dimension-supported", /* CUPS extension */ + "jpeg-y-dimension-supported", /* CUPS extension */ + "landscape-orientation-requested-preferred", + /* CUPS extension */ "marker-change-time", /* CUPS extension */ "marker-colors", /* CUPS extension */ "marker-high-levels", /* CUPS extension */ @@ -1457,6 +1462,8 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "operations-supported", "pages-per-minute", "pages-per-minute-color", + "pdf-k-octets-supported", /* CUPS extension */ + "pdf-versions-supported", /* CUPS extension */ "pdl-override-supported", "port-monitor", /* CUPS extension */ "port-monitor-supported", /* CUPS extension */ diff --git a/cups/util.c b/cups/util.c index a94c4b02e..c070cce4c 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1713,12 +1713,14 @@ cups_get_printer_uri( device_uri = attr->values[0].string.text; if (device_uri && - ((strstr(device_uri, "._ipp.") != NULL || - strstr(device_uri, "._ipps.") != NULL) && - !strcmp(device_uri + strlen(device_uri) - 5, "/cups"))) + (!strncmp(device_uri, "ipp://", 6) || + !strncmp(device_uri, "ipps://", 7) || + ((strstr(device_uri, "._ipp.") != NULL || + strstr(device_uri, "._ipps.") != NULL) && + !strcmp(device_uri + strlen(device_uri) - 5, "/cups")))) { /* - * Statically-configured Bonjour shared printer. + * Statically-configured shared printer. */ httpSeparateURI(HTTP_URI_CODING_ALL, diff --git a/scheduler/colorman.c b/scheduler/colorman.c index 53cd03d8a..a5838503d 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -1128,14 +1128,14 @@ colord_delete_device( message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice"); dbus_message_iter_init_append(message, &args); - dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_id); + dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path); /* * Send the DeleteDevice request synchronously... */ dbus_error_init(&error); - cupsdLogMessage(CUPSD_LOG_DEBUG, "Calling DeleteDevice(%s)", device_id); + cupsdLogMessage(CUPSD_LOG_DEBUG, "Calling DeleteDevice(%s)", device_path); reply = dbus_connection_send_with_reply_and_block(colord_con, message, COLORD_DBUS_TIMEOUT, &error); diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index aa15702df..c4806f569 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -3,7 +3,7 @@ * * Filtering program for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -917,7 +917,7 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ { int i; /* Looping var */ const char *argv[8], /* Command-line arguments */ - *envp[15], /* Environment variables */ + *envp[16], /* Environment variables */ *temp; /* Temporary string */ char *optstr, /* Filter options */ content_type[1024], /* CONTENT_TYPE */ @@ -1040,7 +1040,8 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ envp[11] = printer_name; envp[12] = rip_max_cache; envp[13] = userenv; - envp[14] = NULL; + envp[14] = "CHARSET=utf-8"; + envp[15] = NULL; for (i = 0; argv[i]; i ++) fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]); diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 9e25a9474..3f2c0191e 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -8058,7 +8058,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ * Grab format from client... */ - if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, + if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, @@ -8075,7 +8075,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ * Use default document format... */ - if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) + if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."), @@ -9290,7 +9290,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ * Grab format from client... */ - if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", + if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."), @@ -9306,7 +9306,7 @@ send_document(cupsd_client_t *con, /* I - Client connection */ * Use default document format... */ - if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) + if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format-default \"%s\"."), default_format); @@ -10806,7 +10806,7 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ if ((format = ippFindAttribute(con->request, "document-format", IPP_TAG_MIMETYPE)) != NULL) { - if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", + if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, diff --git a/scheduler/testmime.c b/scheduler/testmime.c index 9d68abb4d..ad7914d20 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -3,7 +3,7 @@ * * MIME test program for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -132,7 +132,7 @@ main(int argc, /* I - Number of command-line args */ } else { - sscanf(argv[i], "%15[^/]/%31s", super, type); + sscanf(argv[i], "%15[^/]/%255s", super, type); dst = mimeType(mime, super, type); filters = mimeFilter2(mime, src, srcinfo.st_size, dst, &cost); diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test index 4fd0ad7e1..620282a3e 100644 --- a/test/ipp-1.1.test +++ b/test/ipp-1.1.test @@ -3,7 +3,7 @@ # # IPP/1.1 test suite. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2013 by Apple Inc. # Copyright 2001-2006 by Easy Software Products. All rights reserved. # # These coded instructions, statements, and computer programs are the @@ -156,7 +156,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS client-error-document-format-not-supported STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -324,7 +324,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" EXPECT natural-language-configured OF-TYPE naturalLanguage IN-GROUP printer-attributes-tag COUNT 1 EXPECT pdl-override-supported OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 EXPECT printer-is-accepting-jobs OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 - EXPECT printer-name OF-TYPE name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^.{1,127}$$/" + EXPECT printer-name OF-TYPE name IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^.{0,127}$$/" EXPECT printer-state OF-TYPE enum IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 3,4,5 EXPECT printer-state-reasons OF-TYPE keyword IN-GROUP printer-attributes-tag EXPECT printer-up-time OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >0 @@ -833,7 +833,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS client-error-document-format-not-supported STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -945,7 +945,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1262,7 +1262,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS client-error-document-format-not-supported STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1300,7 +1300,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1338,7 +1338,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1374,7 +1374,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1412,7 +1412,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1450,7 +1450,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1488,7 +1488,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1524,7 +1524,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1562,7 +1562,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1600,7 +1600,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1636,7 +1636,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1672,7 +1672,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1708,7 +1708,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1744,7 +1744,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1780,7 +1780,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1820,7 +1820,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1858,7 +1858,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1896,7 +1896,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1934,7 +1934,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -1974,7 +1974,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2012,7 +2012,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2050,7 +2050,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2088,7 +2088,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2128,7 +2128,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2166,7 +2166,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2204,7 +2204,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2242,7 +2242,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2280,7 +2280,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag @@ -2315,7 +2315,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" STATUS successful-ok STATUS server-error-job-canceled - STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 10 + STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30 EXPECT job-uri OF-TYPE uri COUNT 1 IN-GROUP job-attributes-tag WITH-VALUE "$IPP_URI_SCHEME" EXPECT job-id OF-TYPE integer COUNT 1 IN-GROUP job-attributes-tag diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test index 4260cd815..d1e5b2ce3 100644 --- a/test/ipp-everywhere.test +++ b/test/ipp-everywhere.test @@ -69,10 +69,10 @@ INCLUDE "ipp-2.0.test" EXPECT ipp-features-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "ipp-everywhere" - EXPECT job-account-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE 1 COUNT 1 DEFINE-MATCH JOB_ACCOUNT_ID_SUPPORTED + EXPECT job-account-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE true COUNT 1 DEFINE-MATCH JOB_ACCOUNT_ID_SUPPORTED EXPECT job-account-id-default OF-TYPE name|no-value IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED JOB_ACCOUNT_ID_SUPPORTED - EXPECT job-accounting-user-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE 1 COUNT 1 DEFINE-MATCH JOB_ACCOUNTING_USER_ID_SUPPORTED + EXPECT job-accounting-user-id-supported OF-TYPE boolean IN-GROUP printer-attributes-tag WITH-VALUE true COUNT 1 DEFINE-MATCH JOB_ACCOUNTING_USER_ID_SUPPORTED EXPECT job-accounting-user-id-default OF-TYPE name|no-value IN-GROUP printer-attributes-tag COUNT 1 IF-DEFINED JOB_ACCOUNTING_USER_ID_SUPPORTED EXPECT job-constraints-supported OF-TYPE collection IN-GROUP printer-attributes-tag DEFINE-MATCH JOB_CONSTRAINTS_SUPPORTED @@ -80,9 +80,9 @@ INCLUDE "ipp-2.0.test" EXPECT job-creation-attributes-supported OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT job-ids-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 + EXPECT job-ids-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE true - EXPECT job-preferred-attributes-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 + EXPECT preferred-attributes-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 EXPECT media-bottom-margin-supported OF-TYPE integer IN-GROUP printer-attributes-tag WITH-ALL-VALUES >-1 EXPECT media-left-margin-supported OF-TYPE integer IN-GROUP printer-attributes-tag WITH-ALL-VALUES >-1 @@ -103,14 +103,14 @@ INCLUDE "ipp-2.0.test" EXPECT multiple-document-jobs-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 - EXPECT multiple-operation-timeout OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >0 + EXPECT multiple-operation-time-out OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >0 - EXPECT multiple-operation-timeout-action OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^(abort-job|hold-job|process-job)$/" + EXPECT multiple-operation-time-out-action OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^(abort-job|hold-job|process-job)$/" EXPECT overrides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "document-number" EXPECT overrides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "pages" - EXPECT page-ranges-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE 1 IF-DEFINED PDF_OR_OPENXPS + EXPECT page-ranges-supported OF-TYPE boolean IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE true IF-DEFINED PDF_OR_OPENXPS EXPECT print-color-mode-default OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^(auto|auto-monochrome|bi-level|color|highlight|monochrome|process-bi-level|process-monochrome)$/" EXPECT print-color-mode-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-ALL-VALUES "/^(auto|auto-monochrome|bi-level|color|highlight|monochrome|process-bi-level|process-monochrome)$/" @@ -144,8 +144,8 @@ INCLUDE "ipp-2.0.test" EXPECT ?printer-mandatory-job-attributes OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT printer-organization OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT printer-organizational-unit OF-TYPE keyword IN-GROUP printer-attributes-tag + EXPECT printer-organization OF-TYPE text IN-GROUP printer-attributes-tag + EXPECT printer-organizational-unit OF-TYPE text IN-GROUP printer-attributes-tag EXPECT printer-state-change-date-time OF-TYPE dateTime IN-GROUP printer-attributes-tag COUNT 1 EXPECT printer-state-change-time OF-TYPE integer IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE >-1 @@ -153,9 +153,9 @@ INCLUDE "ipp-2.0.test" EXPECT printer-supply OF-TYPE octetString IN-GROUP printer-attributes-tag SAME-COUNT-AS printer-supply-description EXPECT printer-supply-description OF-TYPE text IN-GROUP printer-attributes-tag SAME-COUNT-AS printer-supply - EXPECT printer-supply-uri OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 + EXPECT printer-supply-info-uri OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 - EXPECT printer-uuid OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^urn:uuid:[0-9A-F]{8,8}-[0-9A-F]{4,4}-[0-9A-F]{4,4}-[0-9A-F]{4,4}-[0-9A-F]{12,12}/" + EXPECT printer-uuid OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "/^urn:uuid:[0-9A-Fa-f]{8,8}-[0-9A-Fa-f]{4,4}-[0-9A-Fa-f]{4,4}-[0-9A-Fa-f]{4,4}-[0-9A-Fa-f]{12,12}/" EXPECT pwg-raster-document-resolution-supported OF-TYPE resolution IN-GROUP printer-attributes-tag EXPECT pwg-raster-document-resolution-supported WITH-VALUE 150dpi DEFINE-MATCH HAVE_150DPI @@ -168,11 +168,11 @@ INCLUDE "ipp-2.0.test" EXPECT pwg-raster-document-sheet-back OF-TYPE keyword IN-GROUP printer-attributes-tag COUNT 1 EXPECT pwg-raster-document-type-supported OF-TYPE keyword IN-GROUP printer-attributes-tag - EXPECT pwg-raster-document-type-supported WITH-VALUE "black-1" DEFINE-MATCH HAVE_BLACK_1 - EXPECT pwg-raster-document-type-supported WITH-VALUE "cmyk-8" DEFINE-MATCH HAVE_CMYK_8 - EXPECT pwg-raster-document-type-supported WITH-VALUE "sgray-8" DEFINE-MATCH HAVE_SGRAY_8 - EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb-8" DEFINE-MATCH HAVE_SRGB_8 - EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb-16" DEFINE-MATCH HAVE_SRGB_16 + EXPECT pwg-raster-document-type-supported WITH-VALUE "black_1" DEFINE-MATCH HAVE_BLACK_1 + EXPECT pwg-raster-document-type-supported WITH-VALUE "cmyk_8" DEFINE-MATCH HAVE_CMYK_8 + EXPECT pwg-raster-document-type-supported WITH-VALUE "sgray_8" DEFINE-MATCH HAVE_SGRAY_8 + EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb_8" DEFINE-MATCH HAVE_SRGB_8 + EXPECT pwg-raster-document-type-supported WITH-VALUE "srgb_16" DEFINE-MATCH HAVE_SRGB_16 EXPECT which-jobs-supported OF-TYPE keyword IN-GROUP printer-attributes-tag } -- 2.39.5