Merge changes from CUPS 1.5b1-r9774.

[thirdparty/cups.git] / cups / http-addrlist.c

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 6fa7140c66a1d706ab480212661b549d4ff133b5..4c82a966c5e58419fb0a986f7f8baa9f1a200891 100644 (file)
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -414,7 +414,7 @@ httpAddrGetList(const char *hostname,       /* I - Hostname, IP address, or NULL for p
         portnum = 80;
       else if (!strcmp(service, "https"))
         portnum = 443;
-      else if (!strcmp(service, "ipp"))
+      else if (!strcmp(service, "ipp") || !strcmp(service, "ipps"))
         portnum = 631;
       else if (!strcmp(service, "lpd"))
         portnum = 515;
@@ -535,14 +535,17 @@ httpAddrGetList(const char *hostname,     /* I - Hostname, IP address, or NULL for p
       portnum = 80;
     else if (!strcmp(service, "https"))
       portnum = 443;
-    else if (!strcmp(service, "ipp"))
+    else if (!strcmp(service, "ipp") || !strcmp(service, "ipps"))
       portnum = 631;
     else if (!strcmp(service, "lpd"))
       portnum = 515;
     else if (!strcmp(service, "socket"))
       portnum = 9100;
     else
+    {
+      httpAddrFreeList(first);
       return (NULL);
+    }
 
     if (hostname && !strcasecmp(hostname, "localhost"))
     {