Merge changes from CUPS 1.4svn-r7394.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@702 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 17 insertions, 0 deletions

diff --git a/cups/http-support.c b/cups/http-support.c
index be6cfbe84..a8d58b0be 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -36,6 +36,7 @@
  *   httpStatus()         - Return a short string describing a HTTP status code.
  *   _cups_hstrerror()    - hstrerror() emulation function for Solaris and
  *                          others...
+ *   _httpEncodeURI()     - Percent-encode a HTTP request URI.
  *   http_copy_decode()   - Copy and decode a URI.
  *   http_copy_encode()   - Copy and encode a URI.
  */
@@ -1204,6 +1205,20 @@ _cups_hstrerror(int error)		/* I - Error number */
 
 
 /*
+ * '_httpEncodeURI()' - Percent-encode a HTTP request URI.
+ */
+
+char *					/* O - Encoded URI */
+_httpEncodeURI(char       *dst,		/* I - Destination buffer */
+               const char *src,		/* I - Source URI */
+	       size_t     dstsize)	/* I - Size of destination buffer */
+{
+  http_copy_encode(dst, src, dst + dstsize - 1, NULL, NULL, 1);
+  return (dst);
+}
+
+
+/*
  * 'http_copy_decode()' - Copy and decode a URI.
  */
 
@@ -1311,6 +1326,8 @@ http_copy_encode(char       *dst,	/* O - Destination buffer */
       *dst++ = *src++;
   }
 
+  *dst = '\0';
+
   if (*src)
     return (NULL);
   else