Merge changes from CUPS 1.5svn-r9763.

[thirdparty/cups.git] / cups / testhttp.c

diff --git a/cups/testhttp.c b/cups/testhttp.c
index f711e9ab95bac0e900025389d7bd82df4f0014ae..959b6175fa38c66ae9d3d88c35dcabfd77c726f0 100644 (file)
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -465,14 +465,32 @@ main(int  argc,                           /* I - Number of command-line arguments */
     char       resolved[1024];         /* Resolved URI */
 
 
-    printf("_httpResolveURI(%s): ", argv[1]);
+    printf("_httpResolveURI(%s, _HTTP_RESOLVE_DEFAULT): ", argv[1]);
     fflush(stdout);
 
-    if (!_httpResolveURI(argv[1], resolved, sizeof(resolved), 1, NULL, NULL))
+    if (!_httpResolveURI(argv[1], resolved, sizeof(resolved),
+                         _HTTP_RESOLVE_DEFAULT, NULL, NULL))
     {
       puts("FAIL");
       return (1);
     }
+    else
+      printf("PASS (%s)\n", resolved);
+
+    printf("_httpResolveURI(%s, _HTTP_RESOLVE_FQDN): ", argv[1]);
+    fflush(stdout);
+
+    if (!_httpResolveURI(argv[1], resolved, sizeof(resolved),
+                         _HTTP_RESOLVE_FQDN, NULL, NULL))
+    {
+      puts("FAIL");
+      return (1);
+    }
+    else if (strstr(resolved, ".local:"))
+    {
+      printf("FAIL (%s)\n", resolved);
+      return (1);
+    }
     else
     {
       printf("PASS (%s)\n", resolved);