Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11875 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 4c66c866c3e32931a6b40d64be3ce0a51756b084..83add7dcfa43dbdd808034b50e49aa27ce419129 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.3 - 2014-05-09
+CHANGES.txt - 1.7.3 - 2014-05-13
 --------------------------------
 
 CHANGES IN CUPS V1.7.3
@@ -13,6 +13,8 @@ CHANGES IN CUPS V1.7.3
        - The IPP backend did not abort a job when the printer did not validate
          the supplied options (<rdar://problem/16836752>)
        - Fixed an authentication race condition in cupsSendRequest (STR #4403)
+       - cupsGetDestMediaCount did not work for CUPS_MEDIA_FLAGS DEFAULT
+         (STR #4414)
 
 
 CHANGES IN CUPS V1.7.2

diff --git a/cups/dest-options.c b/cups/dest-options.c
index 4b03189c53192d06e82bf0a8f25b81c6fb17ed74..97ee9c25fb4871627685d28476cd50419e79edb0 100644 (file)
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -1320,6 +1320,8 @@ cups_create_cached(http_t       *http,    /* I - Connection to destination */
                mdb->top >= first->top && mdb->bottom >= first->bottom)
         first = mdb;
     }
+    else
+      cupsArrayAdd(dinfo->cached_db, mdb);
   }
 
   if (flags & CUPS_MEDIA_FLAGS_DUPLEX)