Fix httpSeparate() handling of file:///path.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@3308 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 594ff9a093af53dbe3902a0b71aed974e301873c..770add5fb4532318818b6449e204c6b7343e5440 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
-CHANGES.txt - 01/31/2003
+CHANGES.txt - 02/03/2003
 ------------------------
 
 CHANGES IN CUPS V1.1.19
 
+       - The httpSeparate() function didn't handle file URIs of
+         the form "file:///path" properly.
        - The lpadmin command now supports a "protocol" option
          for specifying the binary communications protocol to
          use when printing binary PostScript data.

diff --git a/cups/http-support.c b/cups/http-support.c
index 31e59b5fd645f6931da89aa872636569f140c615..5dd7f5f0a33c29b4014636f3e9a003f975779df0 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c,v 1.4 2002/12/17 18:56:41 swdev Exp $"
+ * "$Id: http-support.c,v 1.5 2003/02/04 05:08:43 mike Exp $"
  *
  *   HTTP support routines for the Common UNIX Printing System (CUPS).
  *
@@ -162,8 +162,7 @@ httpSeparate(const char *uri,               /* I - Universal Resource Identifier */
   * Grab the username, if any...
   */
 
-  while (*uri == '/')
-    uri ++;
+  uri += 2;
 
   if ((slash = strchr(uri, '/')) == NULL)
     slash = uri + strlen(uri);
@@ -313,5 +312,5 @@ httpStatus(http_status_t status)    /* I - HTTP status code */
 
 
 /*
- * End of "$Id: http-support.c,v 1.4 2002/12/17 18:56:41 swdev Exp $".
+ * End of "$Id: http-support.c,v 1.5 2003/02/04 05:08:43 mike Exp $".
  */