Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3864 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index c17854ea110642a1691e732851bac6f1c431f327..695f5b3a1c7a305d90e6c3ad90e54693c3febc86 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20rc1
 
+       - cupsEncodeOptions() did not allow boolean options to
+         use "yes" and "on" for true values (STR #227)
        - The pstops filter only sent the TBCP exit sequence if
          it was defined in the JCLEnd attribute in the PPD file
          (STR #224)

diff --git a/cups/encode.c b/cups/encode.c
index ce0938e29012a1b4245923216bc0b8dc409861a7..fa908bd06450052ca40e2dab5a00177a71f85d40 100644 (file)
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c,v 1.1.2.13 2003/02/13 03:23:55 mike Exp $"
+ * "$Id: encode.c,v 1.1.2.14 2003/08/08 20:49:24 mike Exp $"
  *
  *   Option encoding routines for the Common UNIX Printing System (CUPS).
  *
@@ -290,7 +290,9 @@ cupsEncodeOptions(ipp_t         *ipp,               /* I - Request to add to */
             break;
 
        case IPP_TAG_BOOLEAN :
-           if (strcasecmp(val, "true") == 0)
+           if (!strcasecmp(val, "true") ||
+               !strcasecmp(val, "on") ||
+               !strcasecmp(val, "yes"))
            {
             /*
              * Boolean value - true...
@@ -382,5 +384,5 @@ cupsEncodeOptions(ipp_t         *ipp,               /* I - Request to add to */
 
 
 /*
- * End of "$Id: encode.c,v 1.1.2.13 2003/02/13 03:23:55 mike Exp $".
+ * End of "$Id: encode.c,v 1.1.2.14 2003/08/08 20:49:24 mike Exp $".
  */