Mirror fix from master.

diff --git a/CHANGES.txt b/CHANGES.txt
index 402045ee594549d0840ad74755aa37f194f31d04..d5c883df8d25b9a668e06535f931b45a0e7bc2e9 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@ CHANGES.txt - 2.1.4 - 2016-03-24
 CHANGES IN CUPS V2.1.4
 
        - The ipptool program truncated values at 8k (Issue #4786)
+       - The ipptool program did not correctly report uriScheme values in plist
+         output (Issue #4785)
        - The cups-lpd mini-daemon incorrectly included the document-name
          attribute when creating a job.  It should only be included when
          sending a job (Issue #4790)

diff --git a/test/ipptool.c b/test/ipptool.c
index 24b4b069e4a9f14fa4afa100c006f2b0c8360c09..bf4af105e11cfdfbca05ac02f0be632a38b324c0 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -4398,10 +4398,11 @@ print_attr(FILE            *outfile,    /* I  - Output file */
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
       case IPP_TAG_KEYWORD :
-      case IPP_TAG_CHARSET :
       case IPP_TAG_URI :
-      case IPP_TAG_MIMETYPE :
+      case IPP_TAG_URISCHEME :
+      case IPP_TAG_CHARSET :
       case IPP_TAG_LANGUAGE :
+      case IPP_TAG_MIMETYPE :
          for (i = 0; i < attr->num_values; i ++)
            print_xml_string(outfile, "string", attr->values[i].string.text);
          break;