Mirror fix from master.

diff --git a/CHANGES.txt b/CHANGES.txt
index 4a15956225618c94a6abfc50b68444025ee6b9aa..402045ee594549d0840ad74755aa37f194f31d04 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ CHANGES.txt - 2.1.4 - 2016-03-24
 
 CHANGES IN CUPS V2.1.4
 
+       - The ipptool program truncated values at 8k (Issue #4786)
        - 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 69c305a0ce1b04c7b721288d93b830d20f76af2e..24b4b069e4a9f14fa4afa100c006f2b0c8360c09 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1,6 +1,4 @@
 /*
- * "$Id: ipptool.c 13075 2016-01-29 21:14:05Z msweet $"
- *
  * ipptool command for CUPS.
  *
  * Copyright 2007-2016 by Apple Inc.
@@ -786,7 +784,7 @@ do_tests(FILE         *outfile,             /* I - Output file */
                token[1024],            /* Token from file */
                *tokenptr,              /* Pointer into token */
                temp[1024],             /* Temporary string */
-               buffer[8192],           /* Copy buffer */
+               buffer[131072],         /* Copy buffer */
                compression[16];        /* COMPRESSION value */
   ipp_t                *request = NULL,        /* IPP request */
                *response = NULL;       /* IPP response */
@@ -4442,7 +4440,7 @@ print_attr(FILE            *outfile,      /* I  - Output file */
   }
   else
   {
-    char       buffer[8192];           /* Value buffer */
+    char       buffer[131072];         /* Value buffer */
 
     if (format == _CUPS_OUTPUT_TEST)
     {
@@ -6198,8 +6196,3 @@ with_value_from(
 
   return (0);
 }
-
-
-/*
- * End of "$Id: ipptool.c 13075 2016-01-29 21:14:05Z msweet $".
- */