From eac3a0a01bf37d95f4129b28296cb697c54b2613 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 11 May 2011 05:36:13 +0000
Subject: Merge changes from CUPS 1.5svn-r9763.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3242 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 cups/util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cups/util.c')

diff --git a/cups/util.c b/cups/util.c
index 4e5c74035..fb565937b 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -3,7 +3,7 @@
  *
  *   Printing utilities for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1762,7 +1762,8 @@ cups_get_printer_uri(
     {
       httpSeparateURI(HTTP_URI_CODING_ALL,
                       _httpResolveURI(attr->values[0].string.text, uri,
-		                      sizeof(uri), 0, NULL, NULL),
+		                      sizeof(uri), _HTTP_RESOLVE_DEFAULT,
+				      NULL, NULL),
                       scheme, sizeof(scheme), username, sizeof(username),
 		      host, hostsize, port, resource, resourcesize);
       ippDelete(response);
-- 
cgit v1.2.1