From: mike Date: Wed, 20 Feb 2013 12:48:28 +0000 (+0000) Subject: Allow empty printer-name values (allowed by the spec but completely useless.) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75a839a5a907a0e3fd1d04507354fa2ce2d66c22;p=thirdparty%2Fcups.git Allow empty printer-name values (allowed by the spec but completely useless.) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10874 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt index 6089106fd9..2efec97c0c 100644 --- a/CHANGES-IPPTOOL.txt +++ b/CHANGES-IPPTOOL.txt @@ -1,4 +1,4 @@ -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 @@ -9,6 +9,7 @@ on cups.org. - 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. diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test index 2d109a6fed..620282a3e1 100644 --- a/test/ipp-1.1.test +++ b/test/ipp-1.1.test @@ -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