[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10873 - in branches/branch-1.6: . cups
From:       cups-dev () easysw ! com
Date:       2013-02-20 2:16:14
Message-ID: 11643-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2013-02-19 18:16:13 -0800 (Tue, 19 Feb 2013)
New Revision: 10873
Log:
Mirror fix from trunk.


Modified:
   branches/branch-1.6/CHANGES.txt
   branches/branch-1.6/cups/util.c

Modified: branches/branch-1.6/CHANGES.txt
===================================================================
--- branches/branch-1.6/CHANGES.txt	2013-02-20 02:08:50 UTC (rev 10872)
+++ branches/branch-1.6/CHANGES.txt	2013-02-20 02:16:13 UTC (rev 10873)
@@ -13,6 +13,8 @@
 	- Added a French localization (STR #4247)
 	- Added a Russian localization (STR #4228)
 	- Updated the Catalan localization (STR #4202)
+	- cupsGetPPD did not work with statically-configured CUPS shared
+	  queues (STR #4178)
 	- The scheduler did not support long MIME media types (STR #4270)
 	- The cupsfilter command did not set the CHARSET environment variable
 	  for the text filters (STR #4273)

Modified: branches/branch-1.6/cups/util.c
===================================================================
--- branches/branch-1.6/cups/util.c	2013-02-20 02:08:50 UTC (rev 10872)
+++ branches/branch-1.6/cups/util.c	2013-02-20 02:16:13 UTC (rev 10873)
@@ -1712,12 +1712,14 @@
       device_uri = attr->values[0].string.text;
 
     if (device_uri &&
-        ((strstr(device_uri, "._ipp.") != NULL ||
-          strstr(device_uri, "._ipps.") != NULL) &&
-         !strcmp(device_uri + strlen(device_uri) - 5, "/cups")))
+        (!strncmp(device_uri, "ipp://", 6) ||
+         !strncmp(device_uri, "ipps://", 7) ||
+         ((strstr(device_uri, "._ipp.") != NULL ||
+           strstr(device_uri, "._ipps.") != NULL) &&
+          !strcmp(device_uri + strlen(device_uri) - 5, "/cups"))))
     {
      /*
-      * Statically-configured Bonjour shared printer.
+      * Statically-configured shared printer.
       */
 
       httpSeparateURI(HTTP_URI_CODING_ALL,

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]